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

Allow inlining value type methods

Browse Source
This commit is contained in:
de4dot 2012-01-25 12:19:45 +01:00
parent fb1a45c5a4
commit 5704e90423
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
blocks/cflow/MethodCallInlinerBase.cs
View File

@ -106,8 +106,14 @@ namespace de4dot.blocks.cflow {
if (methodArgs.Count - popLastArgs != calledMethodArgs.Count)
return false;
for (int i = 0; i < calledMethodArgs.Count; i++) {
if (!isCompatibleType(calledMethodArgs[i], methodArgs[i]))
return false;
var calledMethodArg = calledMethodArgs[i];
var methodArg = methodArgs[i];
if (!isCompatibleType(calledMethodArg, methodArg)) {
if (i != 0 || !calledMethod.HasImplicitThis)
return false;
if (!isCompatibleValueThisPtr(calledMethodArg, methodArg))
return false;
}
}
instr = DotNetUtils.getInstruction(methodToInline.Body.Instructions, ref instrIndex);
@ -163,5 +169,14 @@ namespace de4dot.blocks.cflow {
protected virtual bool isCompatibleType(TypeReference origType, TypeReference newType) {
return MemberReferenceHelper.compareTypes(origType, newType);
}
static bool isCompatibleValueThisPtr(TypeReference origType, TypeReference newType) {
var newByRef = newType as ByReferenceType;
if (newByRef == null)
return false;
if (!newByRef.ElementType.IsValueType || !origType.IsValueType)
return false;
return MemberReferenceHelper.compareTypes(origType, newByRef.ElementType);
}
}
}