chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix method signature comparison.

Browse Source 
Now that we generate methods in instantiated generic types, we were
getting test failures from methods that were being detected as new
methods. In actuality, they weren't new, but they differed only in
generic type parameters from some base type method, and
GetSignatureString ignores generic parameters completely.

This fix eliminates the hacky GetSignatureString and replaces it with
more-or-less proper signature comparison. This even manages to fix an
incorrect test case from Methods.cs (because GetSignatureString was
incorrectly incorporating the return type - when the return type should
not be examined for signature checking).
This commit is contained in:
Robert Xiao
2020-04-13 06:09:05 -07:00
committed by Katy
parent 652d76d6fe
commit 1a12567227
7 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Il2CppInspector.Common/Reflection/ConstructorInfo.cs
View File

@@ -28,8 +28,5 @@ namespace Il2CppInspector.Reflection
public override string ToString() => DeclaringType.Name + GetFullTypeParametersString()
+ "(" + string.Join(", ", DeclaredParameters.Select(x => x.ParameterType.Name)) + ")";
public override string GetSignatureString() => Name + GetFullTypeParametersString()
+ "(" + string.Join(",", DeclaredParameters.Select(x => x.GetSignatureString())) + ")";
}
}

20
Il2CppInspector.Common/Reflection/MethodBase.cs
View File

@@ -265,7 +265,7 @@ namespace Il2CppInspector.Reflection
modifiers.Append("extern ");
// Method hiding
if ((DeclaringType.BaseType?.GetAllMethods().Any(m => m.GetSignatureString() == GetSignatureString() && m.IsHideBySig) ?? false)
if ((DeclaringType.BaseType?.GetAllMethods().Any(m => SignatureEquals(m) && m.IsHideBySig) ?? false)
&& (((Attributes & MethodAttributes.VtableLayoutMask) == MethodAttributes.ReuseSlot && !IsVirtual)
|| (Attributes & MethodAttributes.VtableLayoutMask) == MethodAttributes.NewSlot))
modifiers.Append("new ");
@@ -289,7 +289,23 @@ namespace Il2CppInspector.Reflection
public string GetFullTypeParametersString() => !GetGenericArguments().Any()? "" :
"[" + string.Join(",", GetGenericArguments().Select(p => p.Name)) + "]";
public abstract string GetSignatureString();
public bool SignatureEquals(MethodBase other) {
if (this == other)
return true;
if (Name != other.Name)
return false;
if (DeclaredParameters.Count != other.DeclaredParameters.Count)
return false;
if (genericArguments.Length != other.genericArguments.Length)
return false;
if (DeclaredParameters.All(p => !p.ParameterType.ContainsGenericParameters))
return Enumerable.SequenceEqual(DeclaredParameters.Select(p => p.ParameterType), other.DeclaredParameters.Select(p => p.ParameterType));
// We have to do something more expensive: check to see if the signatures are the same if the method type parameters are equated.
// We substitute generic arguments into every parameter type but use a common set of method type parameters.
return Enumerable.SequenceEqual(
rootDefinition.DeclaredParameters.Select(p => p.ParameterType.SubstituteGenericArguments(DeclaringType.GetGenericArguments(), genericArguments)),
other.rootDefinition.DeclaredParameters.Select(p => p.ParameterType.SubstituteGenericArguments(other.DeclaringType.GetGenericArguments(), genericArguments)));
}
// List of operator overload metadata names
// https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/operator-overloads

3
Il2CppInspector.Common/Reflection/MethodInfo.cs
View File

@@ -42,8 +42,5 @@ namespace Il2CppInspector.Reflection
public override string ToString() => ReturnType.Name + " " + Name + GetFullTypeParametersString() + "(" + string.Join(", ",
DeclaredParameters.Select(x => x.ParameterType.IsByRef? x.ParameterType.Name.TrimEnd('&') + " ByRef" : x.ParameterType.Name)) + ")";
public override string GetSignatureString() => ReturnParameter.GetSignatureString() + " " + Name + GetFullTypeParametersString()
+ "(" + string.Join(",", DeclaredParameters.Select(x => x.GetSignatureString())) + ")";
}
}

3
Il2CppInspector.Common/Reflection/TypeInfo.cs
View File

@@ -1094,9 +1094,8 @@ namespace Il2CppInspector.Reflection {
if (DeclaringMethod != null && DeclaringMethod.IsVirtual && !DeclaringMethod.IsAbstract && !DeclaringMethod.IsFinal
&& (DeclaringMethod.Attributes & MethodAttributes.VtableLayoutMask) == MethodAttributes.ReuseSlot) {
// Find nearest ancestor base method which has us as a generic type parameter
var sig = DeclaringMethod.GetSignatureString();
var method = DeclaringMethod.DeclaringType.BaseType.GetAllMethods()
.FirstOrDefault(m => m.IsHideBySig && m.IsVirtual && m.GetSignatureString() == sig && m.GetGenericArguments().Any(p => p.Name == Name));
.FirstOrDefault(m => m.IsHideBySig && m.IsVirtual && DeclaringMethod.SignatureEquals(m) && m.GetGenericArguments().Any(p => p.Name == Name));
// Stop if we are inherited from a base method
if (method != null)

2
Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs
View File

@@ -1073,6 +1073,6 @@ namespace Il2CppTests.TestSources
public TestNewNonVirtualMethod() {} // 0x0000000180123B00-0x0000000180123B10
// Methods
public int ValueTypeReturnMethod() => default; // 0x00000001802586A0-0x00000001802586B0
public new int ValueTypeReturnMethod() => default; // 0x00000001802586A0-0x00000001802586B0
}
}

2
Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs
View File

@@ -1073,6 +1073,6 @@ namespace Il2CppTests.TestSources
public TestNewNonVirtualMethod() {} // 0x100F4510-0x100F4520
// Methods
public int ValueTypeReturnMethod() => default; // 0x101FA200-0x101FA210
public new int ValueTypeReturnMethod() => default; // 0x101FA200-0x101FA210
}
}

2
Il2CppTests/TestExpectedResults/Methods.cs
View File

@@ -1073,6 +1073,6 @@ namespace Il2CppTests.TestSources
public TestNewNonVirtualMethod() {} // 0x00A4ACE0-0x00A4ACE8
// Methods
public int ValueTypeReturnMethod() => default; // 0x00A4ACD8-0x00A4ACE0
public new int ValueTypeReturnMethod() => default; // 0x00A4ACD8-0x00A4ACE0
}
}