Browse Source

Fix bug in CollectNamespacesForDecompilation

pull/1096/merge
Siegfried Pammer 7 years ago
parent
commit
ff9789f8a7
  1. 7
      ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

7
ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@ -618,6 +618,11 @@ namespace ICSharpCode.Decompiler.CSharp
CollectNamespacesForDecompilation(p.ParameterType, namespaces); CollectNamespacesForDecompilation(p.ParameterType, namespaces);
} }
} }
if (!decodeDetails) break;
var resolved = methodRef.ResolveWithinSameModule();
if (resolved != null && resolved.HasBody) {
CollectNamespacesForDecompilation(resolved.Body, namespaces);
}
break; break;
} }
} }
@ -634,7 +639,7 @@ namespace ICSharpCode.Decompiler.CSharp
} }
foreach (var inst in body.Instructions) { foreach (var inst in body.Instructions) {
if (inst.Operand is MemberReference mr) if (inst.Operand is MemberReference mr)
CollectNamespacesForDecompilation(mr, namespaces); CollectNamespacesForDecompilation(mr, namespaces, inst.OpCode.Code == Mono.Cecil.Cil.Code.Ldftn);
} }
} }

Loading…
Cancel
Save