monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move code to new checkSameMethods() method

Browse Source
This commit is contained in:
de4dot 2012-02-03 14:21:58 +01:00
parent 0cc88ba39f
commit 5bcb0e51c1
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
blocks/cflow/MethodCallInlinerBase.cs
View File

@ -101,20 +101,8 @@ namespace de4dot.blocks.cflow {
if (!isCompatibleType(-1, calledMethod.MethodReturnType.ReturnType, methodToInline.MethodReturnType.ReturnType))
return false;
var methodArgs = DotNetUtils.getArgs(methodToInline);
var calledMethodArgs = DotNetUtils.getArgs(calledMethod);
if (methodArgs.Count - popLastArgs != calledMethodArgs.Count)
if (!checkSameMethods(calledMethod, methodToInline, popLastArgs))
return false;
for (int i = 0; i < calledMethodArgs.Count; i++) {
var calledMethodArg = calledMethodArgs[i];
var methodArg = methodArgs[i];
if (!isCompatibleType(i, calledMethodArg, methodArg)) {
if (i != 0 || !calledMethod.HasImplicitThis)
return false;
if (!isCompatibleValueThisPtr(calledMethodArg, methodArg))
return false;
}
}
instr = DotNetUtils.getInstruction(methodToInline.Body.Instructions, ref instrIndex);
if (instr == null || instr.OpCode.Code != Code.Ret)
@ -166,6 +154,25 @@ namespace de4dot.blocks.cflow {
return false;
}
protected bool checkSameMethods(MethodReference method, MethodDefinition methodToInline, int ignoreLastMethodToInlineArgs = 0) {
var methodToInlineArgs = DotNetUtils.getArgs(methodToInline);
var methodArgs = DotNetUtils.getArgs(method);
if (methodToInlineArgs.Count - ignoreLastMethodToInlineArgs != methodArgs.Count)
return false;
for (int i = 0; i < methodArgs.Count; i++) {
var methodArg = methodArgs[i];
var methodToInlineArg = methodToInlineArgs[i];
if (!isCompatibleType(i, methodArg, methodToInlineArg)) {
if (i != 0 || !method.HasImplicitThis)
return false;
if (!isCompatibleValueThisPtr(methodArg, methodToInlineArg))
return false;
}
}
return true;
}
protected virtual bool isCompatibleType(int paramIndex, TypeReference origType, TypeReference newType) {
return MemberReferenceHelper.compareTypes(origType, newType);
}