Browse Source

AssignVariableNames.GetNameFromInstruction: also handle LdFlda directly

pull/924/head
Daniel Grunwald 8 years ago
parent
commit
f4682fd75a
  1. 13
      ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs

13
ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs

@ -226,14 +226,11 @@ namespace ICSharpCode.Decompiler.IL.Transforms
{ {
switch (inst) { switch (inst) {
case LdObj ldobj: case LdObj ldobj:
IField field; return GetNameFromInstruction(ldobj.Target);
if (ldobj.Target is LdFlda ldflda) case LdFlda ldflda:
field = ldflda.Field; return CleanUpVariableName(ldflda.Field.Name);
else if (ldobj.Target is LdsFlda ldsflda) case LdsFlda ldsflda:
field = ldsflda.Field; return CleanUpVariableName(ldsflda.Field.Name);
else
break;
return CleanUpVariableName(field.Name);
case CallInstruction call: case CallInstruction call:
if (call is NewObj) break; if (call is NewObj) break;
IMethod m = call.Method; IMethod m = call.Method;

Loading…
Cancel
Save