File tree Expand file tree Collapse file tree 3 files changed +5
-9
lines changed Expand file tree Collapse file tree 3 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -1764,17 +1764,16 @@ static void __stdcall FiberDetachCallback(void* lpFlsData)
1764
1764
}
1765
1765
}
1766
1766
1767
- bool InitFlsSlot ()
1767
+ void InitFlsSlot ()
1768
1768
{
1769
1769
// We use fiber detach callbacks to run our thread shutdown code because the fiber detach
1770
1770
// callback is made without the OS loader lock
1771
1771
g_flsIndex = FlsAlloc (FiberDetachCallback);
1772
1772
if (g_flsIndex == FLS_OUT_OF_INDEXES)
1773
1773
{
1774
- return false ;
1774
+ _ASSERTE (!" Initialization of an FLS slot failed." );
1775
+ COMPlusThrowWin32 ();
1775
1776
}
1776
-
1777
- return true ;
1778
1777
}
1779
1778
1780
1779
// Register the thread with OS to be notified when thread is about to be destroyed
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ void ThreadDetaching();
47
47
48
48
void EnsureTlsDestructionMonitor ();
49
49
#ifdef TARGET_WINDOWS
50
- bool InitFlsSlot ();
50
+ void InitFlsSlot ();
51
51
bool OsDetachThread (void * thread);
52
52
#endif
53
53
Original file line number Diff line number Diff line change @@ -1075,10 +1075,7 @@ void InitThreadManager()
1075
1075
CONTRACTL_END;
1076
1076
1077
1077
#ifdef TARGET_WINDOWS
1078
- if (!InitFlsSlot ())
1079
- {
1080
- _ASSERTE_ALL_BUILDS (!" Initialization of a FLS slot failed." );
1081
- }
1078
+ InitFlsSlot ();
1082
1079
#endif
1083
1080
1084
1081
// All patched helpers should fit into one page.
You can’t perform that action at this time.
0 commit comments