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

Update if expr and dynamic method name

Browse Source
This commit is contained in:
de4dot 2011-12-16 09:49:15 +01:00
parent 2a0e92eaff
commit 78124ea282
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AssemblyData/methodsrewriter/MMethod.cs
View File

@ -29,6 +29,10 @@ namespace AssemblyData.methodsrewriter {
this.methodDefinition = methodDefinition;
}
public bool hasInstructions() {
return methodDefinition.Body != null && methodDefinition.Body.Instructions.Count != 0;
}
public override string ToString() {
return methodDefinition.ToString();
}

8
AssemblyData/methodsrewriter/MethodsRewriter.cs
View File

@ -163,10 +163,10 @@ namespace AssemblyData.methodsrewriter {
return newMethodInfo.rewrittenMethod;
}
string getDelegateMethodName(string methodName) {
string getDelegateMethodName(MethodBase method) {
string name = null;
do {
name = string.Format(" {0} DMN {1:X8} ", methodName, Utils.getRandomUint());
name = string.Format(" {0} {1:X8} DMN {2:X8} ", method.Name, method.MetadataToken, Utils.getRandomUint());
} while (delegateNameToNewMethodInfo.ContainsKey(name));
return name;
}
@ -174,7 +174,7 @@ namespace AssemblyData.methodsrewriter {
public void createMethod(MethodBase realMethod) {
if (realMethodToNewMethod.ContainsKey(realMethod))
return;
var newMethodInfo = new NewMethodInfo(realMethod, newMethodInfos.Count, getDelegateMethodName(realMethod.Name), getDelegateMethodName(realMethod.Name));
var newMethodInfo = new NewMethodInfo(realMethod, newMethodInfos.Count, getDelegateMethodName(realMethod), getDelegateMethodName(realMethod));
newMethodInfos.Add(newMethodInfo);
delegateNameToNewMethodInfo[newMethodInfo.delegateMethodName] = newMethodInfo;
delegateNameToNewMethodInfo[newMethodInfo.rewrittenMethodName] = newMethodInfo;
@ -182,7 +182,7 @@ namespace AssemblyData.methodsrewriter {
var moduleInfo = Resolver.loadAssembly(realMethod.Module);
var methodInfo = moduleInfo.getMethod(realMethod);
if (!methodInfo.methodDefinition.HasBody || methodInfo.methodDefinition.Body.Instructions.Count == 0)
if (!methodInfo.hasInstructions())
throw new ApplicationException(string.Format("Method {0} ({1:X8}) has no body", methodInfo.methodDefinition, methodInfo.methodDefinition.MetadataToken.ToUInt32()));
var codeGenerator = new CodeGenerator(this, newMethodInfo.delegateMethodName);