ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not process vars if there were errors in the method

Browse Source
This commit is contained in:
Egor.Ushakov
2017-04-21 19:16:45 +03:00
parent 7041accfe9
commit 0b442fc64b
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
View File

@@ -158,31 +158,33 @@ public class ClassWrapper {
methods.addWithKey(methodWrapper, InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor())); methods.addWithKey(methodWrapper, InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()));
// rename vars so that no one has the same name as a field if (!isError) {
varProc.refreshVarNames(new VarNamesCollector(setFieldNames)); // rename vars so that no one has the same name as a field
varProc.refreshVarNames(new VarNamesCollector(setFieldNames));
// if debug information present and should be used // if debug information present and should be used
if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) { if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr(); StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
if (attr != null) { if (attr != null) {
// only param names here // only param names here
varProc.setDebugVarNames(attr.getMapParamNames()); varProc.setDebugVarNames(attr.getMapParamNames());
// the rest is here // the rest is here
methodWrapper.getOrBuildGraph().iterateExprents(exprent -> { methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
List<Exprent> lst = exprent.getAllExprents(true); List<Exprent> lst = exprent.getAllExprents(true);
lst.add(exprent); lst.add(exprent);
lst.stream() lst.stream()
.filter(e -> e.type == Exprent.EXPRENT_VAR) .filter(e -> e.type == Exprent.EXPRENT_VAR)
.forEach(e -> { .forEach(e -> {
VarExprent varExprent = (VarExprent)e; VarExprent varExprent = (VarExprent)e;
String name = varExprent.getDebugName(mt); String name = varExprent.getDebugName(mt);
if (name != null) { if (name != null) {
varProc.setVarName(varExprent.getVarVersionPair(), name); varProc.setVarName(varExprent.getVarVersionPair(), name);
} }
}); });
return 0; return 0;
}); });
}
} }
} }