Sandbox error reference locator now works with generic method calls

This means resolving the MethodSpec table entry for it.
metalgearsloth · Nov 22, 2024 · 3086fc4 · 3086fc4
1 parent 5f3a543
commit 3086fc4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -47,7 +47,7 @@ END TEMPLATE-->
 
 ### Other
 
-*None yet*
+* Sandbox error reference locator now works with generic method calls.
 
 ### Internal
 

diff --git a/Robust.Shared/ContentPack/AssemblyTypeChecker.ReportBadReferences.cs b/Robust.Shared/ContentPack/AssemblyTypeChecker.ReportBadReferences.cs
@@ -39,7 +39,7 @@ private void ReportBadReferences(PEReader peReader, MetadataReader reader, IEnum
             {
                 if (instruction.TryGetEntityHandle(out var handle))
                 {
-                    if (refs.Contains(handle))
+                    if (refs.Overlaps(ExpandHandle(reader, handle)))
                     {
                         var type = GetTypeFromDefinition(reader, methodDef.GetDeclaringType());
                         _sawmill.Error(
@@ -56,6 +56,12 @@ private static string DisplayHandle(MetadataReader reader, EntityHandle handle)
     {
         switch (handle.Kind)
         {
+            case HandleKind.MethodSpecification:
+                var methodSpec = reader.GetMethodSpecification((MethodSpecificationHandle)handle);
+                var methodProvider = new TypeProvider();
+                var spec = methodSpec.DecodeSignature(methodProvider, 0);
+                return $"{DisplayHandle(reader, methodSpec.Method)}<{string.Join(", ", spec.Select(t => t.ToString()))}>";
+
             case HandleKind.MemberReference:
                 var memberRef = reader.GetMemberReference((MemberReferenceHandle)handle);
                 var name = reader.GetString(memberRef.Name);
@@ -92,6 +98,17 @@ private static void ExpandReferences(MetadataReader reader, HashSet<EntityHandle
         handles.UnionWith(toAdd);
     }
 
+    private static IEnumerable<EntityHandle> ExpandHandle(MetadataReader reader, EntityHandle handle)
+    {
+        // Annoying, S.R.M gives no way to iterate over the MethodSpec table.
+        // This means the only way to correlate MethodSpec references is to do it for each handle.
+
+        yield return handle;
+
+        if (handle.Kind == HandleKind.MethodSpecification)
+            yield return reader.GetMethodSpecification((MethodSpecificationHandle)handle).Method;
+    }
+
     private readonly struct ILInstruction
     {
         public readonly ILOpCode OpCode;