bring back tls_InlinedThreadStatics on Windows temporarily

dotnet · Jun 8, 2023 · 65ca15b · 65ca15b
1 parent 9dd0ec3
commit 65ca15b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/coreclr/nativeaot/Runtime/threadstore.cpp b/src/coreclr/nativeaot/Runtime/threadstore.cpp
@@ -437,6 +437,12 @@ __thread ThreadBuffer tls_CurrentThread;
 __thread InlinedThreadStaticRoot tls_InlinedThreadStatics;
 #endif
 
+#else
+// the root of inlined threadstatics storage
+// there is only one now,
+// eventually this will be emitted by ILC and we may have more than one such variable
+EXTERN_C __declspec(thread) InlinedThreadStaticRoot tls_InlinedThreadStatics;
+__declspec(thread) InlinedThreadStaticRoot tls_InlinedThreadStatics;
 #endif
 
 EXTERN_C ThreadBuffer* RhpGetThread()

diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NodeFactory.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NodeFactory.cs
@@ -1287,7 +1287,7 @@ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory>
             graph.AddRoot(EagerCctorTable, "EagerCctorTable is always generated");
             graph.AddRoot(TypeManagerIndirection, "TypeManagerIndirection is always generated");
 
-            if (!_target.IsOSXLike)
+            if (!_target.IsOSXLike && !_target.IsWindows)
             {
                 graph.AddRoot(TlsRoot, "TlsRoot is always generated");
             }