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

Add a paramIndex parameter

Browse Source
This commit is contained in:
de4dot 2012-02-03 09:42:55 +01:00
parent c09bbf0d01
commit d4b5744894
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/cflow/MethodCallInliner.cs
View File

@ -111,7 +111,7 @@ namespace de4dot.blocks.cflow {
} }
} }
protected override bool isCompatibleType(TypeReference origType, TypeReference newType) { protected override bool isCompatibleType(int paramIndex, TypeReference origType, TypeReference newType) {
if (MemberReferenceHelper.compareTypes(origType, newType)) if (MemberReferenceHelper.compareTypes(origType, newType))
return true; return true;
if (newType.IsValueType || origType.IsValueType) if (newType.IsValueType || origType.IsValueType)

10
blocks/cflow/MethodCallInlinerBase.cs
View File

@ -98,7 +98,7 @@ namespace de4dot.blocks.cflow {
if (calledMethod == null) if (calledMethod == null)
return false; return false;
if (!isCompatibleType(calledMethod.MethodReturnType.ReturnType, methodToInline.MethodReturnType.ReturnType)) if (!isCompatibleType(-1, calledMethod.MethodReturnType.ReturnType, methodToInline.MethodReturnType.ReturnType))
return false; return false;
var methodArgs = DotNetUtils.getArgs(methodToInline); var methodArgs = DotNetUtils.getArgs(methodToInline);
@ -108,7 +108,7 @@ namespace de4dot.blocks.cflow {
for (int i = 0; i < calledMethodArgs.Count; i++) { for (int i = 0; i < calledMethodArgs.Count; i++) {
var calledMethodArg = calledMethodArgs[i]; var calledMethodArg = calledMethodArgs[i];
var methodArg = methodArgs[i]; var methodArg = methodArgs[i];
if (!isCompatibleType(calledMethodArg, methodArg)) { if (!isCompatibleType(i, calledMethodArg, methodArg)) {
if (i != 0 || !calledMethod.HasImplicitThis) if (i != 0 || !calledMethod.HasImplicitThis)
return false; return false;
if (!isCompatibleValueThisPtr(calledMethodArg, methodArg)) if (!isCompatibleValueThisPtr(calledMethodArg, methodArg))
@ -131,7 +131,7 @@ namespace de4dot.blocks.cflow {
if (ctor == null) if (ctor == null)
return false; return false;
if (!isCompatibleType(ctor.DeclaringType, methodToInline.MethodReturnType.ReturnType)) if (!isCompatibleType(-1, ctor.DeclaringType, methodToInline.MethodReturnType.ReturnType))
return false; return false;
var methodArgs = DotNetUtils.getArgs(methodToInline); var methodArgs = DotNetUtils.getArgs(methodToInline);
@ -139,7 +139,7 @@ namespace de4dot.blocks.cflow {
if (methodArgs.Count + 1 - popLastArgs != calledMethodArgs.Count) if (methodArgs.Count + 1 - popLastArgs != calledMethodArgs.Count)
return false; return false;
for (int i = 1; i < calledMethodArgs.Count; i++) { for (int i = 1; i < calledMethodArgs.Count; i++) {
if (!isCompatibleType(calledMethodArgs[i], methodArgs[i - 1])) if (!isCompatibleType(i, calledMethodArgs[i], methodArgs[i - 1]))
return false; return false;
} }
@ -166,7 +166,7 @@ namespace de4dot.blocks.cflow {
return false; return false;
} }
protected virtual bool isCompatibleType(TypeReference origType, TypeReference newType) { protected virtual bool isCompatibleType(int paramIndex, TypeReference origType, TypeReference newType) {
return MemberReferenceHelper.compareTypes(origType, newType); return MemberReferenceHelper.compareTypes(origType, newType);
} }