Merge pull request #1122 from dotnet-bot/from-tfs

Merge changes from TFS

2 files changed, 14 insertions, 6 deletions

diff --git a/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/MetadataTransform.cs b/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/MetadataTransform.cs
index 42babf71b..799862f59 100644
--- a/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/MetadataTransform.cs
+++ b/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/MetadataTransform.cs
@@ -64,8 +64,8 @@ namespace ILCompiler.Metadata
         public abstract MetadataRecord HandleQualifiedMethod(Cts.MethodDesc method);
 
         /// <summary>
-        /// Retrieves an existing <see cref="FieldReference"/> record representing specified field
-        /// in the metadata writer object model, or creates a new one.
+        /// Retrieves an existing <see cref="QualifiedField"> or a <see cref="FieldReference"/> record
+        /// representing specified field in the metadata writer object model, or creates a new one.
         /// </summary>
         public abstract MetadataRecord HandleQualifiedField(Cts.FieldDesc field);
 
diff --git a/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/Transform.Field.cs b/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/Transform.Field.cs
index 908505a56..e82034211 100644
--- a/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/Transform.Field.cs
+++ b/src/ILCompiler.MetadataTransform/src/ILCompiler/Metadata/Transform.Field.cs
@@ -25,7 +25,17 @@ namespace ILCompiler.Metadata
 
         public override MetadataRecord HandleQualifiedField(Cts.FieldDesc field)
         {
-            return HandleFieldReference(field);
+            if (_policy.GeneratesMetadata(field) && field.GetTypicalFieldDefinition() == field)
+            {
+                QualifiedField record = new QualifiedField();
+                record.Field = HandleFieldDefinition(field);
+                record.EnclosingType = (TypeDefinition)HandleType(field.OwningType);
+                return record;
+            }
+            else
+            {
+                return HandleFieldReference(field);
+            }
         }
 
         private Field HandleFieldDefinition(Cts.FieldDesc field)
@@ -68,8 +78,6 @@ namespace ILCompiler.Metadata
 
         private MemberReference HandleFieldReference(Cts.FieldDesc field)
         {
-            Debug.Assert(field.GetTypicalFieldDefinition() == field);
-            Debug.Assert(!_policy.GeneratesMetadata(field));
             return (MemberReference)_fields.GetOrCreate(field, _initFieldRef ?? (_initFieldRef = InitializeFieldReference));
         }
 
@@ -79,7 +87,7 @@ namespace ILCompiler.Metadata
             record.Parent = HandleType(entity.OwningType);
             record.Signature = new FieldSignature
             {
-                Type = HandleType(entity.FieldType),
+                Type = HandleType(entity.GetTypicalFieldDefinition().FieldType),
                 // TODO: CustomModifiers
             };
         }