Fix scanning synchronized methods

After dotnet#85810 we need to generate reflection metadata for owning types of static synchronized methods. Before that change, obtaining a RuntimeType for locking would obtain a reflection blocked type. We now need a named type and scanner must predict it. Found in Pri0 testing.
MichalStrehovsky · May 18, 2023 · 528bfb5 · 528bfb5
1 parent 8c637de
commit 528bfb5
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
@@ -143,6 +143,16 @@ public DependencyList Import()
                 {
                     _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.MonitorEnterStatic), reason);
                     _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.MonitorExitStatic), reason);
+
+                    MethodDesc method = _methodIL.OwningMethod;
+                    if (method.OwningType.IsRuntimeDeterminedSubtype)
+                    {
+                        _dependencies.Add(GetGenericLookupHelper(ReadyToRunHelperId.NecessaryTypeHandle, method.OwningType), reason);
+                    }
+                    else
+                    {
+                        _dependencies.Add(_factory.NecessaryTypeSymbol(method.OwningType), reason);
+                    }
                 }
                 else
                 {