InitFlsSlot throws per convention used in threading initialization

dotnet · Dec 11, 2024 · dfcaf7c · dfcaf7c
1 parent 6da70e0
commit dfcaf7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/coreclr/vm/ceemain.cpp b/src/coreclr/vm/ceemain.cpp
@@ -1759,17 +1759,16 @@ static void __stdcall FiberDetachCallback(void* lpFlsData)
     }
 }
 
-bool InitFlsSlot()
+void InitFlsSlot()
 {
     // We use fiber detach callbacks to run our thread shutdown code because the fiber detach
     // callback is made without the OS loader lock
     g_flsIndex = FlsAlloc(FiberDetachCallback);
     if (g_flsIndex == FLS_OUT_OF_INDEXES)
     {
-        return false;
+        _ASSERTE(!"Initialization of an FLS slot failed.");
+        COMPlusThrowWin32();
     }
-
-    return true;
 }
 
 // Register the thread with OS to be notified when thread is about to be destroyed

diff --git a/src/coreclr/vm/ceemain.h b/src/coreclr/vm/ceemain.h
@@ -47,7 +47,7 @@ void ThreadDetaching();
 
 void EnsureTlsDestructionMonitor();
 #ifdef TARGET_WINDOWS
-bool InitFlsSlot();
+void InitFlsSlot();
 bool OsDetachThread(void* thread);
 #endif
 

diff --git a/src/coreclr/vm/threads.cpp b/src/coreclr/vm/threads.cpp
@@ -1049,10 +1049,7 @@ void InitThreadManager()
     CONTRACTL_END;
 
 #ifdef TARGET_WINDOWS
-    if (!InitFlsSlot())
-    {
-        _ASSERTE_ALL_BUILDS(!"Initialization of a FLS slot failed.");
-    }
+    InitFlsSlot();
 #endif
 
     // All patched helpers should fit into one page.