Merge pull request #179 from Unity-Technologies/bugfix/debug-coreclr-fail-assembly-load-check

bandures · web-flow · commit a16f72f4989c · 2023-05-23T21:22:21.000+01:00
Ensure that methods we get through MethodDesc are activated after load
diff --git a/src/coreclr/vm/mono/mono_coreclr.cpp b/src/coreclr/vm/mono/mono_coreclr.cpp
@@ -679,7 +679,7 @@ extern "C" EXPORT_API MonoMethod* EXPORT_CC mono_class_get_methods(MonoClass* kl
     CONTRACTL
     {
         THROWS;
-        GC_NOTRIGGER;
+        GC_TRIGGERS;
         PRECONDITION(klass != NULL);
     }
     CONTRACTL_END;
@@ -708,6 +708,7 @@ extern "C" EXPORT_API MonoMethod* EXPORT_CC mono_class_get_methods(MonoClass* kl
     }
 
     auto method = iterator->GetMethodDesc();
+    method->EnsureActive();
     iterator->Next();
     return (MonoMethod*)method;
 }

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ extern "C" EXPORT_API MonoMethod* EXPORT_CC mono_class_get_methods(MonoClass* kl`
`679`	`679`	`CONTRACTL`
`680`	`680`	`{`
`681`	`681`	`THROWS;`
`682`		`- GC_NOTRIGGER;`
	`682`	`+ GC_TRIGGERS;`
`683`	`683`	`PRECONDITION(klass != NULL);`
`684`	`684`	`}`
`685`	`685`	`CONTRACTL_END;`
`@@ -708,6 +708,7 @@ extern "C" EXPORT_API MonoMethod* EXPORT_CC mono_class_get_methods(MonoClass* kl`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`auto method = iterator->GetMethodDesc();`
	`711`	`+ method->EnsureActive();`
`711`	`712`	`iterator->Next();`
`712`	`713`	`return (MonoMethod*)method;`
`713`	`714`	`}`