Skip to content

Commit 60bcece

Browse files
committed
Fix return from DoReentrantWaitAny
1 parent f877b08 commit 60bcece

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/coreclr/vm/comsynchronizable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ extern "C" INT32 QCALLTYPE ThreadNative_ReentrantWaitAny(BOOL alertable, INT32 t
935935

936936
Thread *pThread = GetThread();
937937
WaitMode mode = alertable ? WaitMode_Alertable : WaitMode_None;
938-
retVal = pThread->DoReentrantWaitAny(count, handles, timeout, mode);
938+
retVal = (INT32)pThread->DoReentrantWaitAny(count, handles, timeout, mode);
939939

940940
END_QCALL;
941941

src/coreclr/vm/threads.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2973,11 +2973,7 @@ DWORD Thread::DoReentrantWaitAny(int numWaiters, HANDLE* pHandles, DWORD timeout
29732973
}
29742974
CONTRACTL_END;
29752975

2976-
DWORD ret = 0;
2977-
2978-
DoAppropriateAptStateWait(numWaiters, pHandles, FALSE, timeout, mode);
2979-
2980-
return ret;
2976+
return DoAppropriateAptStateWait(numWaiters, pHandles, FALSE, timeout, mode);
29812977
}
29822978

29832979

0 commit comments

Comments
 (0)