pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove unneccessary loop

pull/903/head
mohe2015 8 years ago
parent
1486cd4b62
commit
131233627c
1 changed files with 47 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      ICSharpCode.Decompiler/IL/Transforms/ProxyCallReplacer.cs

98
ICSharpCode.Decompiler/IL/Transforms/ProxyCallReplacer.cs
Unescape View File

@ -35,63 +35,59 @@ namespace ICSharpCode.Decompiler.IL.Transforms @@ -35,63 +35,59 @@ namespace ICSharpCode.Decompiler.IL.Transforms
{
if (inst.Method.DeclaringTypeDefinition == null) // TODO: investigate why
return;
foreach (IMethod method in inst.Method.DeclaringTypeDefinition.Methods) {
if (method.FullName.Equals(inst.Method.FullName)) {
MethodDefinition methodDef = context.TypeSystem.GetCecil(method) as MethodDefinition;
if (methodDef != null && methodDef.Body != null) {
if (method.IsCompilerGeneratedOrIsInCompilerGeneratedClass()) {
// partially copied from CSharpDecompiler
var specializingTypeSystem = this.context.TypeSystem.GetSpecializingTypeSystem(this.context.TypeSystem.Compilation.TypeResolveContext);
var ilReader = new ILReader(specializingTypeSystem);
System.Threading.CancellationToken cancellationToken = new System.Threading.CancellationToken();
var function = ilReader.ReadIL(methodDef.Body, cancellationToken);
var context = new ILTransformContext(function, specializingTypeSystem, this.context.Settings) {
CancellationToken = cancellationToken
};
foreach (var transform in CSharp.CSharpDecompiler.GetILTransforms()) {
if (transform.GetType() != typeof(ProxyCallReplacer)) { // don't call itself on itself
cancellationToken.ThrowIfCancellationRequested();
transform.Run(function, context);
}
MethodDefinition methodDef = context.TypeSystem.GetCecil(inst.Method) as MethodDefinition;
if (methodDef != null && methodDef.Body != null) {
if (inst.Method.IsCompilerGeneratedOrIsInCompilerGeneratedClass()) {
// partially copied from CSharpDecompiler
var specializingTypeSystem = this.context.TypeSystem.GetSpecializingTypeSystem(this.context.TypeSystem.Compilation.TypeResolveContext);
var ilReader = new ILReader(specializingTypeSystem);
System.Threading.CancellationToken cancellationToken = new System.Threading.CancellationToken();
var function = ilReader.ReadIL(methodDef.Body, cancellationToken);
var context = new ILTransformContext(function, specializingTypeSystem, this.context.Settings) {
CancellationToken = cancellationToken
};
foreach (var transform in CSharp.CSharpDecompiler.GetILTransforms()) {
if (transform.GetType() != typeof(ProxyCallReplacer)) { // don't call itself on itself
cancellationToken.ThrowIfCancellationRequested();
transform.Run(function, context);
}
}
Call currentCall = new ProxyMethodVisitor().GetCalledMethod(function, context);
if (currentCall != null) {
Call newInst = (Call)currentCall.Clone();
// check if original arguments are only correct ldloc calls
for (int i = 0; i < currentCall.Arguments.Count; i++) {
var originalArg = currentCall.Arguments.ElementAtOrDefault(i);
if (originalArg.OpCode != OpCode.LdLoc ||
originalArg.Children.Count != 0 ||
((LdLoc)originalArg).Variable.Kind != VariableKind.Parameter ||
((LdLoc)originalArg).Variable.Index != i - 1) {
return;
}
Call currentCall = new ProxyMethodVisitor().GetCalledMethod(function, context);
if (currentCall != null) {
Call newInst = (Call)currentCall.Clone();
// check if original arguments are only correct ldloc calls
for (int i = 0; i < currentCall.Arguments.Count; i++) {
var originalArg = currentCall.Arguments.ElementAtOrDefault(i);
if (originalArg.OpCode != OpCode.LdLoc ||
originalArg.Children.Count != 0 ||
((LdLoc)originalArg).Variable.Kind != VariableKind.Parameter ||
((LdLoc)originalArg).Variable.Index != i-1) {
return;
}
}
newInst.Arguments.Clear();
}
newInst.Arguments.Clear();
ILInstruction thisArg = inst.Arguments.ElementAtOrDefault(0).Clone();
ILInstruction thisArg = inst.Arguments.ElementAtOrDefault(0).Clone();
// special handling for first argument (this) - the underlying issue may be somewhere else
// normally
// leave IL_0000(await(callvirt<> n__0(ldobj xxHandler(ldloca this), ldobj System.Net.Http.HttpRequestMessage(ldloca request), ldobj System.Threading.CancellationToken(ldloca cancellationToken))))
// would be decompiled to
// return await((DelegatingHandler)this).SendAsync(request, cancellationToken);
// this changes it to
// return await base.SendAsync(request, cancellationToken);
if (thisArg.OpCode == OpCode.LdObj && thisArg.Children.Count > 0 && thisArg.Children[0].OpCode == OpCode.LdLoca) {
thisArg = new LdLoc(((LdLoca)thisArg.Children[0]).Variable);
}
// special handling for first argument (this) - the underlying issue may be somewhere else
// normally
// leave IL_0000(await(callvirt<> n__0(ldobj xxHandler(ldloca this), ldobj System.Net.Http.HttpRequestMessage(ldloca request), ldobj System.Threading.CancellationToken(ldloca cancellationToken))))
// would be decompiled to
// return await((DelegatingHandler)this).SendAsync(request, cancellationToken);
// this changes it to
// return await base.SendAsync(request, cancellationToken);
if (thisArg.OpCode == OpCode.LdObj && thisArg.Children.Count > 0 && thisArg.Children[0].OpCode == OpCode.LdLoca) {
thisArg = new LdLoc(((LdLoca)thisArg.Children[0]).Variable);
}
newInst.Arguments.Add(thisArg);
newInst.Arguments.Add(thisArg);
// add everything except first argument
for (int i = 1; i < inst.Arguments.Count; i++) {
newInst.Arguments.Add(inst.Arguments.ElementAtOrDefault(i).Clone());
}
inst.ReplaceWith(newInst);
}
// add everything except first argument
for (int i = 1; i < inst.Arguments.Count; i++) {
newInst.Arguments.Add(inst.Arguments.ElementAtOrDefault(i).Clone());
}
inst.ReplaceWith(newInst);
}
}
}

Write Preview
Loading…
Cancel
Save