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

correctly decompile interface object fields

Browse Source
This commit is contained in:
Alexandru-Constantin Bledea
2016-03-07 18:52:37 +02:00
parent d50e8a860e
commit 06c993b508
5 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
View File

@@ -124,7 +124,7 @@ public class InitializerProcessor {
RootStatement root = meth.root;
StructClass cl = wrapper.getClassStruct();
boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
Statement firstdata = findFirstData(root);
if (firstdata != null) {
while (!firstdata.getExprents().isEmpty()) {
@@ -139,7 +139,8 @@ public class InitializerProcessor {
if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
if (isExprentIndependent(asexpr.getRight(), meth)) {
// interfaces fields should always be initialized inline
if (isInterface || isExprentIndependent(asexpr.getRight(), meth)) {
String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {