Support GenericInstance types in inline method signatures

pardeike · Jan 14, 2024 · 1960f57 · 1960f57
1 parent 1b16c96
commit 1960f57
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Harmony/Internal/InlineSignatureParser.cs b/Harmony/Internal/InlineSignatureParser.cs
@@ -1,6 +1,7 @@
 using Mono.Cecil;
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -185,9 +186,17 @@ object ReadTypeSignature()
 
 					case MetadataType.Var:
 					case MetadataType.MVar:
-					case MetadataType.GenericInstance:
 						throw new NotSupportedException($"Unsupported generic callsite element: {etype}");
 
+					case MetadataType.GenericInstance:
+						reader.ReadByte(); // element type, unused
+						var elType = GetTypeDefOrRef();
+						var arity = (int)ReadCompressedUInt32();
+
+						return elType.MakeGenericType(
+							Enumerable.Range(0, arity).Select(_ => (Type)ReadTypeSignature()).ToArray()
+						);
+
 					case MetadataType.Object:
 						return typeof(object);