It Works!

dotnet · davidwrighton · Aug 13, 2024 · Jul 9, 2024 · Jul 11, 2024 · Jul 11, 2024
commit 54ded9a67765d98be4df17ddce60c77804bdd53f
diff --git a/src/native/managed/cdacreader/src/Helpers/EcmaMetadataReader.cs b/src/native/managed/cdacreader/src/Helpers/EcmaMetadataReader.cs
@@ -278,7 +278,42 @@ public uint GetColumnAsConstant(EcmaMetadataCursor c, MetadataColumnIndex col_id
 
     public System.ReadOnlySpan<byte> GetColumnAsBlob(EcmaMetadataCursor c, MetadataColumnIndex col_idx)
     {
-        throw new NotImplementedException();
+        if (columnTypes[(int)col_idx] != ColumnType.Blob)
+            throw new NotImplementedException();
+
+        uint rawResult = GetColumnRaw(c, col_idx);
+        if (rawResult == 0)
+            return default;
+
+        checked
+        {
+            ReadOnlySpan<byte> blobHeap = _ecmaMetadata.BlobHeap.Span;
+            int curOffset = (int)rawResult;
+
+            byte headerByte1 = blobHeap[curOffset];
+            int size;
+            if ((headerByte1 & 0x80) == 0)
+            {
+                size = headerByte1;
+            }
+            else if ((headerByte1 & 0xC) == 0x80)
+            {
+                byte headerByte2 = blobHeap[++curOffset];
+                size = headerByte1 & 0x3F << 8 + headerByte2;
+            }
+            else
+            {
+                byte headerByte2 = blobHeap[++curOffset];
+                byte headerByte3 = blobHeap[++curOffset];
+                byte headerByte4 = blobHeap[++curOffset];
+                size = (headerByte1 & 0x3F << 24) +
+                       (headerByte2 << 16) +
+                       (headerByte3 << 8) +
+                       headerByte4;
+            }
+            curOffset++;
+            return blobHeap.Slice(curOffset, size);
+        }
     }
 
     public uint GetColumnAsToken(EcmaMetadataCursor c, MetadataColumnIndex col_idx)

diff --git a/src/native/managed/cdacreader/src/Legacy/TypeNameBuilder.cs b/src/native/managed/cdacreader/src/Legacy/TypeNameBuilder.cs
@@ -44,12 +44,15 @@ private enum ParseState
     private int InstNesting;
     private Stack<int>? GenericStartsStack;
 
-    private TypeNameBuilder(StringBuilder typeString, Target target, TypeNameFormat format)
+    private TypeNameBuilder(StringBuilder typeString, Target target, TypeNameFormat format, bool initialStateIsName = false)
     {
         TypeString = typeString;
         Target = target;
         UseAngleBracketsForGenerics = format.HasFlag(TypeNameFormat.FormatAngleBrackets);
-        State = ParseState.Start;
+        if (initialStateIsName)
+            State = ParseState.Name;
+        else
+            State = ParseState.Start;
     }
 
     public static void AppendMethodInternal(Target target, StringBuilder stringBuilder, Contracts.MethodDescHandle method, TypeNameFormat format)
@@ -121,6 +124,12 @@ public static void AppendMethodImpl(Target target, StringBuilder stringBuilder,
             stringBuilder.Append(reader.GetColumnAsUtf8String(cursor, MetadataColumnIndex.MethodDef_Name));
         }
 
+        ReadOnlySpan<TypeHandle> genericMethodInstantiation = runtimeTypeSystem.GetGenericMethodInstantiation(method);
+        if (genericMethodInstantiation.Length > 0 && !runtimeTypeSystem.IsGenericMethodDefinition(method))
+        {
+            AppendInst(target, stringBuilder, genericMethodInstantiation, format);
+        }
+
         if (format.HasFlag(TypeNameFormat.FormatSignature))
         {
             ReadOnlySpan<byte> signature;
@@ -303,6 +312,15 @@ private static void AppendTypeCore(ref TypeNameBuilder tnb, Contracts.TypeHandle
         }
     }
 
+    // Append a square-bracket-enclosed, comma-separated list of n type parameters in inst to the string s
+    // and enclose each parameter in square brackets to disambiguate the commas
+    // The following flags in the FormatFlags argument are significant: FormatNamespace FormatFullInst FormatAssembly FormatNoVersion
+    private static void AppendInst(Target target, StringBuilder stringBuilder, ReadOnlySpan<TypeHandle> inst, TypeNameFormat format)
+    {
+        TypeNameBuilder tnb = new (stringBuilder, target, format, initialStateIsName: true);
+        AppendInst(ref tnb, inst, format);
+    }
+
     private static void AppendInst(ref TypeNameBuilder tnb, ReadOnlySpan<TypeHandle> inst, TypeNameFormat format)
     {
         tnb.OpenGenericArguments();