Add more data into MSTAT files (#93842)

* Manifest resources are a large contributor to WinForms size, we better surface that.
* Frozen objects can get also pretty large
* And so does field RVA data (we have several 10+ kB large RVA static fields just in CoreLib).

Author: MichalStrehovsky

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FieldRvaDataNode.cs

@@ -15,6 +15,8 @@ public class FieldRvaDataNode : ObjectNode, ISymbolDefinitionNode
     {
         private readonly EcmaField _field;
 
+        public EcmaField Field => _field;
+
         public FieldRvaDataNode(EcmaField field)
         {
             Debug.Assert(field.HasRva);

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceDataNode.cs

@@ -96,10 +96,9 @@ public IReadOnlyList<ResourceIndexData> GetOrCreateIndexData(NodeFactory factory
                             if (factory.MetadataManager.IsManifestResourceBlocked(factory, module, resourceName))
                                 continue;
 
-                            string assemblyName = module.GetName().FullName;
                             BlobReader reader = resourceDirectory.GetReader((int)resource.Offset, resourceDirectory.Length - (int)resource.Offset);
                             int length = (int)reader.ReadUInt32();
-                            ResourceIndexData indexData = new ResourceIndexData(assemblyName, resourceName, _totalLength, (int)resource.Offset + sizeof(int), module, length);
+                            ResourceIndexData indexData = new ResourceIndexData(module, resourceName, _totalLength, (int)resource.Offset + sizeof(int), module, length);
                             _indexData.Add(indexData);
                             _totalLength += length;
                         }
@@ -149,9 +148,9 @@ private byte[] GenerateResourceBlob(NodeFactory factory)
     /// </summary>
     internal sealed class ResourceIndexData
     {
-        public ResourceIndexData(string assemblyName, string resourceName, int nativeOffset, int ecmaOffset, EcmaModule ecmaModule, int length)
+        public ResourceIndexData(EcmaAssembly assembly, string resourceName, int nativeOffset, int ecmaOffset, EcmaModule ecmaModule, int length)
         {
-            AssemblyName = assemblyName;
+            Assembly = assembly;
             ResourceName = resourceName;
             NativeOffset = nativeOffset;
             EcmaOffset = ecmaOffset;
@@ -160,9 +159,9 @@ public ResourceIndexData(string assemblyName, string resourceName, int nativeOff
         }
 
         /// <summary>
-        /// Full name of the assembly that contains the resource
+        /// Assembly that contains the resource
         /// </summary>
-        public string AssemblyName { get; }
+        public EcmaAssembly Assembly { get; }
 
         /// <summary>
         /// Name of the resource

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceIndexNode.cs

@@ -74,7 +74,8 @@ private byte[] GenerateIndexBlob(NodeFactory factory)
 
             foreach (ResourceIndexData indexData in _resourceDataNode.GetOrCreateIndexData(factory))
             {
-                Vertex asmName = nativeWriter.GetStringConstant(indexData.AssemblyName);
+                string assemblyName = indexData.Assembly.GetName().FullName;
+                Vertex asmName = nativeWriter.GetStringConstant(assemblyName);
                 Vertex resourceName = nativeWriter.GetStringConstant(indexData.ResourceName);
                 Vertex offsetVertex = nativeWriter.GetUnsignedConstant((uint)indexData.NativeOffset);
                 Vertex lengthVertex = nativeWriter.GetUnsignedConstant((uint)indexData.Length);
@@ -83,7 +84,7 @@ private byte[] GenerateIndexBlob(NodeFactory factory)
                 indexVertex = nativeWriter.GetTuple(indexVertex, offsetVertex);
                 indexVertex = nativeWriter.GetTuple(indexVertex, lengthVertex);
 
-                int hashCode = TypeHashingAlgorithms.ComputeNameHashCode(indexData.AssemblyName);
+                int hashCode = TypeHashingAlgorithms.ComputeNameHashCode(assemblyName);
                 indexHashtable.Append((uint)hashCode, indexHashtableSection.Place(indexVertex));
             }
 

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MstatObjectDumper.cs

@@ -12,10 +12,12 @@
 using System.Reflection.PortableExecutable;
 
 using Internal.TypeSystem;
+using Internal.TypeSystem.Ecma;
 
 using ILCompiler.DependencyAnalysis;
 using ILCompiler.DependencyAnalysisFramework;
 
+using Debug = System.Diagnostics.Debug;
 using ObjectData = ILCompiler.DependencyAnalysis.ObjectNode.ObjectData;
 using AssemblyName = System.Reflection.AssemblyName;
 
@@ -24,12 +26,15 @@ namespace ILCompiler
     public class MstatObjectDumper : ObjectDumper
     {
         private const int VersionMajor = 2;
-        private const int VersionMinor = 0;
+        private const int VersionMinor = 1;
 
         private readonly string _fileName;
         private readonly MstatEmitter _emitter;
 
         private readonly InstructionEncoder _types = new InstructionEncoder(new BlobBuilder());
+        private readonly InstructionEncoder _fieldRvas = new InstructionEncoder(new BlobBuilder());
+        private readonly InstructionEncoder _frozenObjects = new InstructionEncoder(new BlobBuilder());
+        private readonly InstructionEncoder _manifestResources = new InstructionEncoder(new BlobBuilder());
 
         private readonly BlobBuilder _mangledNames = new BlobBuilder();
 
@@ -71,7 +76,29 @@ protected override void DumpObjectNode(NodeFactory factory, ObjectNode node, Obj
                 case MethodExceptionHandlingInfoNode ehInfoNode:
                     _methodEhInfo.Add(ehInfoNode.Method, objectData.Data.Length);
                     break;
+                case FieldRvaDataNode rvaDataNode:
+                    _fieldRvas.OpCode(ILOpCode.Ldtoken);
+                    _fieldRvas.Token(_emitter.EmitMetadataHandleForTypeSystemEntity(rvaDataNode.Field));
+                    _fieldRvas.LoadConstantI4(rvaDataNode.Field.GetFieldRvaData().Length);
+                    _fieldRvas.LoadConstantI4(AppendMangledName(DependencyNodeCore<NodeFactory>.GetNodeName(node, factory)));
+                    // Breakdown of RVA data was introduced in MSTAT 2.1. Readers of 2.0 should still see it in the
+                    // global blobs section. We can remove it from there in 3.0.
+                    if (VersionMajor == 2)
+                        goto reportAsBlob;
+                case ArrayOfFrozenObjectsNode:
+                    DumpFrozenRegion(factory);
+                    // Breakdown of frozen regions was introduced in MSTAT 2.1. Readers of 2.0 should still see it in the
+                    // global blobs section. We can remove it from there in 3.0.
+                    if (VersionMajor == 2)
+                        goto reportAsBlob;
+                case ResourceDataNode resourceData:
+                    DumpResourceData(factory, resourceData);
+                    // Breakdown of resource data was introduced in MSTAT 2.1. Readers of 2.0 should still see it in the
+                    // global blobs section. We can remove it from there in 3.0.
+                    if (VersionMajor == 2)
+                        goto reportAsBlob;
                 default:
+                reportAsBlob:
                     string nodeName = GetObjectNodeName(node);
                     if (!_blobs.TryGetValue(nodeName, out int size))
                         size = 0;
@@ -80,6 +107,41 @@ protected override void DumpObjectNode(NodeFactory factory, ObjectNode node, Obj
             }
         }
 
+        private void DumpFrozenRegion(NodeFactory factory)
+        {
+            Debug.Assert(_frozenObjects.Offset == 0);
+
+            foreach (FrozenObjectNode frozenObject in factory.MetadataManager.GetFrozenObjects())
+            {
+                _frozenObjects.OpCode(ILOpCode.Ldtoken);
+                _frozenObjects.Token(_emitter.EmitMetadataHandleForTypeSystemEntity(frozenObject.ObjectType));
+                _frozenObjects.LoadConstantI4(frozenObject.Size);
+                _frozenObjects.LoadConstantI4(AppendMangledName(DependencyNodeCore<NodeFactory>.GetNodeName(frozenObject, factory)));
+
+                if (frozenObject is SerializedFrozenObjectNode serObj)
+                {
+                    _frozenObjects.OpCode(ILOpCode.Ldtoken);
+                    _frozenObjects.Token(_emitter.EmitMetadataHandleForTypeSystemEntity(serObj.OwningType));
+                }
+                else
+                {
+                    _frozenObjects.LoadConstantI4(0);
+                }
+            }
+        }
+
+        private void DumpResourceData(NodeFactory factory, ResourceDataNode resourceData)
+        {
+            Debug.Assert(_manifestResources.Offset == 0);
+
+            foreach (ResourceIndexData resource in resourceData.GetOrCreateIndexData(factory))
+            {
+                _manifestResources.LoadConstantI4(MetadataTokens.GetToken(_emitter.GetAssemblyRef(resource.Assembly)));
+                _manifestResources.LoadString(_emitter.GetUserStringHandle(resource.ResourceName));
+                _manifestResources.LoadConstantI4(resource.Length);
+            }
+        }
+
         private int AppendMangledName(string mangledName)
         {
             int index = _mangledNames.Count;
@@ -110,6 +172,9 @@ internal override void End()
             _emitter.AddGlobalMethod("Methods", methods, 0);
             _emitter.AddGlobalMethod("Types", _types, 0);
             _emitter.AddGlobalMethod("Blobs", blobs, 0);
+            _emitter.AddGlobalMethod("RvaFields", _fieldRvas, 0);
+            _emitter.AddGlobalMethod("FrozenObjects", _frozenObjects, 0);
+            _emitter.AddGlobalMethod("ManifestResources", _manifestResources, 0);
 
             _emitter.AddPESection(".names", _mangledNames);
 

src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs

@@ -1071,8 +1071,7 @@ private void ImportStoreField(int token, bool isStatic)
 
         private void ImportLoadString(int token)
         {
-            // If we care, this can include allocating the frozen string node.
-            _dependencies.Add(_factory.SerializedStringObject(""), "ldstr");
+            _dependencies.Add(_factory.SerializedStringObject((string)_methodIL.GetObject(token)), "ldstr");
         }
 
         private void ImportBox(int token)