Sigh

MichalStrehovsky · Nov 18, 2021 · a706a05 · a706a05
1 parent 24edc80
commit a706a05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/coreclr/tools/Common/TypeSystem/Canon/TypeSystemContext.Canon.cs b/src/coreclr/tools/Common/TypeSystem/Canon/TypeSystemContext.Canon.cs
@@ -92,6 +92,7 @@ protected internal virtual TypeDesc ConvertToCanon(TypeDesc typeToConvert, Canon
             throw new NotSupportedException();
         }
 
+        internal partial void InternalGetSupportsUniversalCanon(ref bool flag) => flag = SupportsUniversalCanon;
         public abstract bool SupportsCanon { get; }
         public abstract bool SupportsUniversalCanon { get; }
 

diff --git a/src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
@@ -169,13 +169,16 @@ out instanceByteSizeAndAlignment
 
         protected virtual ComputedInstanceFieldLayout ComputeInstanceFieldLayout(MetadataType type, int numInstanceFields)
         {
+            bool supportsUniversalCanon = false;
+            type.Context.InternalGetSupportsUniversalCanon(ref supportsUniversalCanon);
+
             if (type.IsExplicitLayout)
             {
                 return ComputeExplicitFieldLayout(type, numInstanceFields);
             }
             // Sequential layout has to be respected for blittable types only. We use approximation and respect it for
             // all types without GC references (ie C# unmanaged types). Universal canonical instances might be blittable.
-            else if (type.IsSequentialLayout && (type.Context.SupportsUniversalCanon || !type.ContainsGCPointers))
+            else if (type.IsSequentialLayout && (supportsUniversalCanon || !type.ContainsGCPointers))
             {
                 return ComputeSequentialFieldLayout(type, numInstanceFields);
             }

diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemContext.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemContext.cs
@@ -813,5 +813,7 @@ internal TypeFlags ComputeTypeFlags(TypeDesc type, TypeFlags flags, TypeFlags ma
         /// Determine if the type implements <code>IDynamicInterfaceCastable</code>
         /// </summary>
         protected internal abstract bool IsIDynamicInterfaceCastableInterface(DefType type);
+
+        internal partial void InternalGetSupportsUniversalCanon(ref bool flag);
     }
 }