moparisthebest/fernflower
1
0
Fork 0
mirror of https://github.com/moparisthebest/fernflower synced 2024-11-23 09:42:18 -05:00
Code Issues Releases Wiki Activity

Fixed wrong order of static initializations (probably part of IDEA-127465)

Browse Source
This commit is contained in:
Stiver 2014-08-17 19:12:27 +02:00
parent e098fbf669
commit 1a8e8ba7a2
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/de/fernflower/main/InitializerProcessor.java
View File

@ -138,12 +138,17 @@ public class InitializerProcessor {
AssignmentExprent asexpr = (AssignmentExprent)exprent; AssignmentExprent asexpr = (AssignmentExprent)exprent;
if(asexpr.getLeft().type == Exprent.EXPRENT_FIELD) { if(asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
FieldExprent fexpr = (FieldExprent)asexpr.getLeft(); FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
if(fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName)) { if(fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString); cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
if(!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField); if(isExprentIndependent(asexpr.getRight(), meth)) {
firstdata.getExprents().remove(0);
found = true; String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
if(!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
firstdata.getExprents().remove(0);
found = true;
}
} }
} }
} }