Ensure static constructors of compiled in types are run (dotnet#5011)

tonerdo · Oct 6, 2020 · 41333f0 · 41333f0
1 parent 54d49bc
commit 41333f0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs b/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs
@@ -2893,6 +2893,12 @@ private void InterpretLoadStaticField(FieldDesc field)
                     nativeFormatField.Handle,
                     out FieldAccessMetadata fieldAccessMetadata);
 
+                IntPtr cctorContext = TypeLoaderEnvironment.TryGetStaticClassConstructionContext(field.OwningType.GetRuntimeTypeHandle());
+                if (cctorContext != IntPtr.Zero)
+                {
+                    RuntimeAugments.EnsureClassConstructorRun(cctorContext);
+                }
+
                 FieldTableFlags fieldFlags = fieldAccessMetadata.Flags & FieldTableFlags.StorageClass;
                 if (fieldFlags == FieldTableFlags.NonGCStatic)
                 {
@@ -3075,6 +3081,12 @@ private void InterpretStoreStaticField(FieldDesc field)
                     nativeFormatField.Handle,
                     out FieldAccessMetadata fieldAccessMetadata);
 
+                IntPtr cctorContext = TypeLoaderEnvironment.TryGetStaticClassConstructionContext(field.OwningType.GetRuntimeTypeHandle());
+                if (cctorContext != IntPtr.Zero)
+                {
+                    RuntimeAugments.EnsureClassConstructorRun(cctorContext);
+                }
+
                 FieldTableFlags fieldFlags = fieldAccessMetadata.Flags & FieldTableFlags.StorageClass;
                 if (fieldFlags == FieldTableFlags.NonGCStatic)
                 {