change for the Native AOT

Author: VSadov

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/TypeLoaderExceptionHelper.cs

@@ -92,6 +92,8 @@ private static string GetFormatString(ExceptionStringID id)
                     return SR.ClassLoad_InlineArrayLength;
                 case ExceptionStringID.ClassLoadInlineArrayExplicit:
                     return SR.ClassLoad_InlineArrayExplicit;
+                case ExceptionStringID.ClassLoadInlineArrayExplicitSize:
+                    return SR.ClassLoad_InlineArrayExplicitSize;
                 case ExceptionStringID.InvalidProgramDefault:
                     return SR.InvalidProgram_Default;
                 case ExceptionStringID.InvalidProgramSpecific:

src/coreclr/tools/Common/TypeSystem/Common/ExceptionStringID.cs

@@ -19,6 +19,7 @@ public enum ExceptionStringID
         ClassLoadInlineArrayFieldCount,
         ClassLoadInlineArrayLength,
         ClassLoadInlineArrayExplicit,
+        ClassLoadInlineArrayExplicitSize,
 
         // MissingMethodException
         MissingMethod,

src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs

@@ -473,6 +473,12 @@ protected ComputedInstanceFieldLayout ComputeSequentialFieldLayout(MetadataType
 
             if (type.IsInlineArray)
             {
+                // inline array cannot have explicit instance size
+                if (layoutMetadata.Size != 0)
+                {
+                    ThrowHelper.ThrowTypeLoadException(ExceptionStringID.ClassLoadInlineArrayExplicitSize, type);
+                }
+
                 AdjustForInlineArray(type, numInstanceFields, ref instanceByteSizeAndAlignment, ref instanceSizeAndAlignment);
             }
 

src/coreclr/tools/Common/TypeSystem/Common/Properties/Resources.resx

@@ -138,6 +138,9 @@
   <data name="ClassLoadInlineArrayExplicit" xml:space="preserve">
     <value>InlineArrayAttribute cannot be applied to a type with explicit layout. Type: '{0}'. Assembly: '{1}'.'</value>
   </data>
+  <data name="ClassLoadInlineArrayExplicitSize" xml:space="preserve">
+    <value>InlineArrayAttribute cannot be applied to a type with explicit size. Type: '{0}'. Assembly: '{1}'.'</value>
+  </data>
   <data name="ClassLoadValueClassTooLarge" xml:space="preserve">
     <value>Array of type '{0}' from assembly '{1}' cannot be created because base value type is too large</value>
   </data>

src/coreclr/vm/methodtablebuilder.cpp

@@ -1794,7 +1794,9 @@ MethodTableBuilder::BuildMethodTableThrowing(
         if ((int)bmtFP->NumInstanceFieldBytes != (INT64)bmtFP->NumInstanceFieldBytes)
             BuildMethodTableThrowException(IDS_CLASSLOAD_FIELDTOOLARGE);
 
-        if (HasExplicitSize() && GetHalfBakedClass()->IsInlineArray())
+        if (HasExplicitSize() &&
+            bmtLayout->layoutType == EEClassLayoutInfo::LayoutType::Sequential &&
+            GetHalfBakedClass()->IsInlineArray())
         {
             BuildMethodTableThrowException(IDS_CLASSLOAD_INLINE_ARRAY_EXPLICIT_SIZE);
         }

src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

@@ -4202,6 +4202,9 @@
   <data name="ClassLoad_InlineArrayExplicit" xml:space="preserve">
     <value>InlineArrayAttribute cannot be applied to a type with explicit layout. Type: '{0}'.  Assembly: '{1}'.</value>
   </data>
+  <data name="ClassLoad_InlineArrayExplicitSize" xml:space="preserve">
+    <value>InlineArrayAttribute cannot be applied to a type with explicit size. Type: '{0}'.  Assembly: '{1}'.</value>
+  </data>
   <data name="ClassLoad_ExplicitGeneric" xml:space="preserve">
     <value>Could not load type '{0}' from assembly '{1}' because generic types cannot have explicit layout.</value>
   </data>

src/mono/mono/metadata/class-init.c

@@ -317,7 +317,7 @@ mono_class_setup_fields (MonoClass *klass)
 	if (explicit_size)
 		instance_size += real_size;
 
-	if (explicit_size && m_class_is_inlinearray (klass)) {
+	if (explicit_size && layout == TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT && m_class_is_inlinearray (klass)) {
 		if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback)
 			mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array must not have explicit size.");
 		else