Make RVA static fields not participate in layout

These fields are not part of static field layout and the field layout
algorithm shouldn't try to handle them.

Issue #407 tracks handling of these.

1 files changed, 3 insertions, 7 deletions

diff --git a/src/Common/src/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs b/src/Common/src/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
index 748b5eebc..57fea83e4 100644
--- a/src/Common/src/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
+++ b/src/Common/src/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
@@ -161,7 +161,7 @@ namespace Internal.TypeSystem
 
             foreach (var field in type.GetFields())
             {
-                if (!field.IsStatic)
+                if (!field.IsStatic || field.HasRva)
                     continue;
 
                 numStaticFields++;
@@ -186,7 +186,8 @@ namespace Internal.TypeSystem
 
             foreach (var field in type.GetFields())
             {
-                if (!field.IsStatic)
+                // Nonstatic fields and RVA mapped fields don't participate in layout
+                if (!field.IsStatic || field.HasRva)
                     continue;
 
                 StaticsBlock* block =
@@ -194,11 +195,6 @@ namespace Internal.TypeSystem
                     field.HasGCStaticBase ? &result.GcStatics :
                     &result.NonGcStatics;
 
-                if (field.HasRva)
-                {
-                    throw new NotImplementedException();
-                }
-
                 SizeAndAlignment sizeAndAlignment = ComputeFieldSizeAndAlignment(field.FieldType, type.Context.Target.DefaultPackingSize);
 
                 block->Size = AlignmentHelper.AlignUp(block->Size, sizeAndAlignment.Alignment);