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

Add non-generic methods to TestGenerics

Browse Source 
In order to select the correct generic type, model.GetGenericMethod is
changed to use Name (which includes generic parameters) instead of
BaseName. The tests for GenericMethodDefinitionInGenericClass* are also
changed to reflect the fact that the chosen methods are fully concrete.

TestGenerics now passes in its entirety.
This commit is contained in:
Robert Xiao
2020-04-11 18:11:18 -07:00
committed by Katy
parent c73aad08b8
commit ec6018d012
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Il2CppInspector.Common/Reflection/Il2CppModel.cs
View File

@@ -59,7 +59,7 @@ namespace Il2CppInspector.Reflection
// Get a concrete instantiation of a generic method from its fully qualified name and type arguments // Get a concrete instantiation of a generic method from its fully qualified name and type arguments
public MethodBase GetGenericMethod(string fullName, params TypeInfo[] typeArguments) => public MethodBase GetGenericMethod(string fullName, params TypeInfo[] typeArguments) =>
GenericMethods.Values.First(m => fullName == m.DeclaringType.Namespace + "." + m.DeclaringType.BaseName + "." + m.Name GenericMethods.Values.First(m => fullName == m.DeclaringType.Namespace + "." + m.DeclaringType.Name + "." + m.Name
&& m.GetGenericArguments().SequenceEqual(typeArguments)); && m.GetGenericArguments().SequenceEqual(typeArguments));
// Create type model // Create type model

17
Il2CppTests/TestGenerics.cs
View File

@@ -51,10 +51,14 @@ namespace Il2CppInspector
MethodBase mGMDINGC_closed = model.GetGenericMethod( MethodBase mGMDINGC_closed = model.GetGenericMethod(
"Il2CppTests.TestSources.NonGeneric.GenericMethodDefinitionInNonGenericClass", model.GetType("System.Single")); "Il2CppTests.TestSources.NonGeneric.GenericMethodDefinitionInNonGenericClass", model.GetType("System.Single"));
MethodBase mNGMIGC_closed = model.GetGenericMethod(
"Il2CppTests.TestSources.GenericClassWithMethods`1[System.Int32].NonGenericMethodInGenericClass");
MethodBase mNGMIGC2_closed = model.GetGenericMethod(
"Il2CppTests.TestSources.GenericClassWithMethods`1[System.Int32].NonGenericMethodInGenericClass2");
MethodBase mGMDIGC_closed = model.GetGenericMethod( MethodBase mGMDIGC_closed = model.GetGenericMethod(
"Il2CppTests.TestSources.GenericClassWithMethods`1.GenericMethodDefinitionInGenericClass", model.GetType("System.Int32")); "Il2CppTests.TestSources.GenericClassWithMethods`1[System.Int32].GenericMethodDefinitionInGenericClass", model.GetType("System.Int32"));
MethodBase mGMDIGC2_closed = model.GetGenericMethod( MethodBase mGMDIGC2_closed = model.GetGenericMethod(
"Il2CppTests.TestSources.GenericClassWithMethods`1.GenericMethodDefinitionInGenericClass2", model.GetType("System.String")); "Il2CppTests.TestSources.GenericClassWithMethods`1[System.Int32].GenericMethodDefinitionInGenericClass2", model.GetType("System.String"));
DisplayGenericType(tBase, "Generic type definition Base<T, U>"); DisplayGenericType(tBase, "Generic type definition Base<T, U>");
DisplayGenericType(tDerived, "Derived<V>"); DisplayGenericType(tDerived, "Derived<V>");
@@ -85,13 +89,10 @@ namespace Il2CppInspector
(mGMDIGC2, "Void GenericMethodDefinitionInGenericClass2[U](T, U)", true, true, true, false), (mGMDIGC2, "Void GenericMethodDefinitionInGenericClass2[U](T, U)", true, true, true, false),
(mGMDINGC_closed, "Void GenericMethodDefinitionInNonGenericClass[Single](Single)", true, false, false, true), (mGMDINGC_closed, "Void GenericMethodDefinitionInNonGenericClass[Single](Single)", true, false, false, true),
// TODO: We can't test non-generic methods in a generic class until we've implemented parameter substitution in TypeInfo constructor
/*
(mNGMIGC_closed, "Void NonGenericMethodInGenericClass(Int32)", false, false, false, false), (mNGMIGC_closed, "Void NonGenericMethodInGenericClass(Int32)", false, false, false, false),
(mNGMIGC2_closed, "Void NonGenericMethodInGenericClass()", false, false, false, false), (mNGMIGC2_closed, "Void NonGenericMethodInGenericClass2()", false, false, false, false),
*/ (mGMDIGC_closed, "Void GenericMethodDefinitionInGenericClass[Int32](Int32)", true, false, false, true),
(mGMDIGC_closed, "Void GenericMethodDefinitionInGenericClass[Int32](Int32)", true, true, false, true), (mGMDIGC2_closed, "Void GenericMethodDefinitionInGenericClass2[String](Int32, String)", true, false, false, true),
(mGMDIGC2_closed, "Void GenericMethodDefinitionInGenericClass2[String](T, String)", true, true, false, true) // It's actually System.String in .NET
}; };
foreach (var check in typeChecks) { foreach (var check in typeChecks) {