Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GenericInstance types in inline method signatures #565

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion Harmony/Internal/InlineSignatureParser.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Mono.Cecil;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -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);

Expand Down