moparisthebest
/
fernflower
mirror of https://github.com/moparisthebest/fernflower
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed 'IDEA-128595: Variable name set to "this"'

This commit is contained in:
Stiver 2014-08-13 22:08:06 +02:00
parent a2fa99e3a2
commit 04b5c9abb1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java
View File

@ -60,7 +60,7 @@ public class VarVersionsProcessor {
typeproc = new VarTypeProcessor(); typeproc = new VarTypeProcessor();
typeproc.calculateVarTypes(root, dgraph); typeproc.calculateVarTypes(root, dgraph);
simpleMerge(typeproc, dgraph); simpleMerge(typeproc, dgraph, mt);
// FIXME: advanced merging // FIXME: advanced merging
@ -146,6 +146,8 @@ public class VarVersionsProcessor {
type = type.type == CodeConstants.TYPE_BYTECHAR?VarType.VARTYPE_BYTE:VarType.VARTYPE_SHORT; type = type.type == CodeConstants.TYPE_BYTECHAR?VarType.VARTYPE_BYTE:VarType.VARTYPE_SHORT;
} }
mapExprentMinTypes.put(paar, type); mapExprentMinTypes.put(paar, type);
//} else if(type.type == CodeConstants.TYPE_CHAR && (maxtype == null || maxtype.type == CodeConstants.TYPE_INT)) { // when possible, lift char to int
// mapExprentMinTypes.put(paar, VarType.VARTYPE_INT);
} else if(type.type == CodeConstants.TYPE_NULL) { } else if(type.type == CodeConstants.TYPE_NULL) {
mapExprentMinTypes.put(paar, VarType.VARTYPE_OBJECT); mapExprentMinTypes.put(paar, VarType.VARTYPE_OBJECT);
} }
@ -153,7 +155,7 @@ public class VarVersionsProcessor {
} }
private void simpleMerge(VarTypeProcessor typeproc, DirectGraph dgraph) { private void simpleMerge(VarTypeProcessor typeproc, DirectGraph dgraph, StructMethod mt) {
HashMap<VarVersionPaar, VarType> mapExprentMaxTypes = typeproc.getMapExprentMaxTypes(); HashMap<VarVersionPaar, VarType> mapExprentMaxTypes = typeproc.getMapExprentMaxTypes();
HashMap<VarVersionPaar, VarType> mapExprentMinTypes = typeproc.getMapExprentMinTypes(); HashMap<VarVersionPaar, VarType> mapExprentMinTypes = typeproc.getMapExprentMinTypes();
@ -171,6 +173,8 @@ public class VarVersionsProcessor {
} }
} }
boolean is_method_static = (mt.getAccessFlags() & CodeConstants.ACC_STATIC) != 0;
final HashMap<VarVersionPaar, Integer> mapMergedVersions = new HashMap<VarVersionPaar, Integer>(); final HashMap<VarVersionPaar, Integer> mapMergedVersions = new HashMap<VarVersionPaar, Integer>();
for(Entry<Integer, HashSet<Integer>> ent: mapVarVersions.entrySet()) { for(Entry<Integer, HashSet<Integer>> ent: mapVarVersions.entrySet()) {
@ -183,6 +187,10 @@ public class VarVersionsProcessor {
VarVersionPaar firstpaar = new VarVersionPaar(ent.getKey(), lstVersions.get(i)); VarVersionPaar firstpaar = new VarVersionPaar(ent.getKey(), lstVersions.get(i));
VarType firsttype = mapExprentMinTypes.get(firstpaar); VarType firsttype = mapExprentMinTypes.get(firstpaar);
if(firstpaar.var == 0 && firstpaar.version == 1 && !is_method_static) {
continue; // don't merge 'this' variable
}
for(int j=i+1;j<lstVersions.size();j++) { for(int j=i+1;j<lstVersions.size();j++) {
VarVersionPaar secpaar = new VarVersionPaar(ent.getKey(), lstVersions.get(j)); VarVersionPaar secpaar = new VarVersionPaar(ent.getKey(), lstVersions.get(j));
VarType sectype = mapExprentMinTypes.get(secpaar); VarType sectype = mapExprentMinTypes.get(secpaar);