PHXH
/
hybridclr_unity
53
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] fix bug of GenericArgumentContext that inflate ByRef and SZArray to Ptr.

main
walon 2025-05-22 19:53:49 +08:00
parent 804418fddb
commit da46e71534
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Editor/Meta/GenericArgumentContext.cs
View File

@ -29,9 +29,9 @@ namespace HybridCLR.Editor.Meta
switch (typeSig.ElementType) switch (typeSig.ElementType)
{ {
case ElementType.Ptr: return new PtrSig(Resolve(typeSig.Next)); case ElementType.Ptr: return new PtrSig(Resolve(typeSig.Next));
case ElementType.ByRef: return new PtrSig(Resolve(typeSig.Next)); case ElementType.ByRef: return new ByRefSig(Resolve(typeSig.Next));
case ElementType.SZArray: return new PtrSig(Resolve(typeSig.Next)); case ElementType.SZArray: return new SZArraySig(Resolve(typeSig.Next));
case ElementType.Array: case ElementType.Array:
{ {
var ara = (ArraySig)typeSig; var ara = (ArraySig)typeSig;
@ -41,7 +41,7 @@ namespace HybridCLR.Editor.Meta
case ElementType.Var: case ElementType.Var:
{ {
GenericVar genericVar = (GenericVar)typeSig; GenericVar genericVar = (GenericVar)typeSig;
var newSig = Resolve(typeArgsStack, genericVar.Number, true); var newSig = Resolve(typeArgsStack, genericVar.Number);
if (newSig == null) if (newSig == null)
{ {
throw new Exception(); throw new Exception();
@ -52,7 +52,7 @@ namespace HybridCLR.Editor.Meta
case ElementType.MVar: case ElementType.MVar:
{ {
GenericMVar genericVar = (GenericMVar)typeSig; GenericMVar genericVar = (GenericMVar)typeSig;
var newSig = Resolve(methodArgsStack, genericVar.Number, true); var newSig = Resolve(methodArgsStack, genericVar.Number);
if (newSig == null) if (newSig == null)
{ {
throw new Exception(); throw new Exception();
@ -101,13 +101,9 @@ namespace HybridCLR.Editor.Meta
} }
} }
private TypeSig Resolve(List<TypeSig> args, uint number, bool isTypeVar) private TypeSig Resolve(List<TypeSig> args, uint number)
{ {
var typeSig = args[(int)number]; return args[(int)number];
var gvar = typeSig as GenericSig;
if (gvar is null || gvar.IsTypeVar != isTypeVar)
return typeSig;
return gvar;
} }
} }