Improve local variable reconstruction

emmanue1 · emmanue1 · commit 210935d4569a · 2019-06-22T12:35:17.000+02:00
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/Frame.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/Frame.java
@@ -40,7 +40,7 @@ public Frame(Frame parent, Statements statements) {
     }
 
     public void addLocalVariable(AbstractLocalVariable lv) {
-        assert lv.next == null;
+        assert lv.getNext() == null;
 
         int index = lv.getIndex();
 
@@ -54,7 +54,7 @@ public void addLocalVariable(AbstractLocalVariable lv) {
 
         if (next != lv) {
             localVariableArray[index] = lv;
-            lv.next = next;
+            lv.setNext(next);
             lv.setFrame(this);
         }
     }
@@ -177,8 +177,8 @@ public void createNames(HashSet<String> parentNames) {
                 } else {
                     names.add(lv.name);
                 }
-                assert lv != lv.next;
-                lv = lv.next;
+                assert lv != lv.getNext();
+                lv = lv.getNext();
             }
         }
 
@@ -203,7 +203,7 @@ public void createNames(HashSet<String> parentNames) {
                         lv.getType().accept(visitor);
                         lv.name = visitor.getName();
                     }
-                    lv = lv.next;
+                    lv = lv.getNext();
                 }
             }
 
@@ -338,7 +338,7 @@ protected HashMap<Frame, HashSet<AbstractLocalVariable>> createMapForInlineDecla
                         variablesToDeclare.add(lv);
                     }
                 }
-                lv = lv.next;
+                lv = lv.getNext();
             }
         }
 
@@ -567,7 +567,7 @@ protected void createStartBlockDeclarations() {
                     lv.setDeclared(true);
                 }
 
-                lv = lv.next;
+                lv = lv.getNext();
             }
         }
     }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/LocalVariableSet.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/LocalVariableSet.java
@@ -29,23 +29,23 @@ public void add(int index, AbstractLocalVariable newLV) {
                 array[index] = newLV;
             } else if (lv.fromOffset < newLV.fromOffset) {
                 assert newLV != lv;
-                newLV.next = lv;
+                newLV.setNext(lv);
                 array[index] = newLV;
             } else {
                 AbstractLocalVariable previous = lv;
 
-                lv = lv.next;
+                lv = lv.getNext();
 
                 while ((lv != null) && (lv.fromOffset > newLV.fromOffset)) {
                     previous = lv;
-                    lv = lv.next;
+                    lv = lv.getNext();
                 }
 
                 assert previous != newLV;
-                previous.next = newLV;
+                previous.setNext(newLV);
 
                 assert newLV != lv;
-                newLV.next = lv;
+                newLV.setNext(lv);
             }
         }
 
@@ -57,9 +57,9 @@ public AbstractLocalVariable root(int index) {
             AbstractLocalVariable lv = array[index];
 
             if (lv != null) {
-                while (lv.next != null) {
-                    assert lv != lv.next;
-                    lv = lv.next;
+                while (lv.getNext() != null) {
+                    assert lv != lv.getNext();
+                    lv = lv.getNext();
                 }
                 return lv;
             }
@@ -76,19 +76,19 @@ public AbstractLocalVariable remove(int index, int offset) {
             while (lv != null) {
                 if (lv.fromOffset <= offset) {
                     if (previous == null) {
-                        array[index] = lv.next;
+                        array[index] = lv.getNext();
                     } else {
-                        previous.next = lv.next;
+                        previous.setNext(lv.getNext());
                     }
 
                     size--;
-                    lv.next = null;
+                    lv.setNext(null);
                     return lv;
                 }
 
                 previous = lv;
-                assert lv != lv.next;
-                lv = lv.next;
+                assert lv != lv.getNext();
+                lv = lv.getNext();
             }
         }
 
@@ -110,8 +110,8 @@ public void update(int index, int offset, ObjectType type) {
                     break;
                 }
 
-                assert lv != lv.next;
-                lv = lv.next;
+                assert lv != lv.getNext();
+                lv = lv.getNext();
             }
         }
     }
@@ -124,21 +124,21 @@ public void update(int index, int offset, GenericType type) {
             while (lv != null) {
                 if (lv.fromOffset == offset) {
                     GenericLocalVariable glv = new GenericLocalVariable(index, lv.fromOffset, type, lv.name);
-                    glv.next = lv.next;
+                    glv.setNext(lv.getNext());
 
                     if (previous == null) {
                         array[index] = glv;
                     } else {
                         assert previous != glv;
-                        previous.next = glv;
+                        previous.setNext(glv);
                     }
 
                     break;
                 }
 
                 previous = lv;
-                assert lv != lv.next;
-                lv = lv.next;
+                assert lv != lv.getNext();
+                lv = lv.getNext();
             }
         }
     }
@@ -152,21 +152,21 @@ public AbstractLocalVariable[] initialize(Frame rootFrame) {
             if (lv != null) {
                 AbstractLocalVariable previous = null;
 
-                while (lv.next != null) {
+                while (lv.getNext() != null) {
                     previous = lv;
-                    assert lv != lv.next;
-                    lv = lv.next;
+                    assert lv != lv.getNext();
+                    lv = lv.getNext();
                 }
 
                 if (lv.fromOffset == 0) {
                     if (previous == null) {
-                        array[index] = lv.next;
+                        array[index] = lv.getNext();
                     } else {
-                        previous.next = lv.next;
+                        previous.setNext(lv.getNext());
                     }
 
                     size--;
-                    lv.next = null;
+                    lv.setNext(null);
                     rootFrame.addLocalVariable(lv);
                     cache[index] = lv;
                 }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/LocalVariableMaker.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/LocalVariableMaker.java
@@ -313,8 +313,10 @@ public AbstractLocalVariable getLocalVariable(int index, int offset) {
         } else if (lv.getFrame() != currentFrame) {
             Frame frame = searchCommonParentFrame(lv.getFrame(), currentFrame);
             frame.mergeLocalVariable(lv);
-            lv.setNext(null);
-            frame.addLocalVariable(lv);
+            if (lv.getFrame() != frame) {
+                lv.getFrame().removeLocalVariable(lv);
+                frame.addLocalVariable(lv);
+            }
         }
 
         lv.setToOffset(offset);
diff --git a/src/test/java/org/jd/core/v1/ClassFileToJavaSourceTest.java b/src/test/java/org/jd/core/v1/ClassFileToJavaSourceTest.java

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Frame(Frame parent, Statements statements) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public void addLocalVariable(AbstractLocalVariable lv) {`
`43`		`- assert lv.next == null;`
	`43`	`+ assert lv.getNext() == null;`
`44`	`44`
`45`	`45`	`int index = lv.getIndex();`
`46`	`46`
`@@ -54,7 +54,7 @@ public void addLocalVariable(AbstractLocalVariable lv) {`
`54`	`54`
`55`	`55`	`if (next != lv) {`
`56`	`56`	`localVariableArray[index] = lv;`
`57`		`- lv.next = next;`
	`57`	`+ lv.setNext(next);`
`58`	`58`	`lv.setFrame(this);`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -177,8 +177,8 @@ public void createNames(HashSet<String> parentNames) {`
`177`	`177`	`} else {`
`178`	`178`	`names.add(lv.name);`
`179`	`179`	`}`
`180`		`- assert lv != lv.next;`
`181`		`- lv = lv.next;`
	`180`	`+ assert lv != lv.getNext();`
	`181`	`+ lv = lv.getNext();`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`@@ -203,7 +203,7 @@ public void createNames(HashSet<String> parentNames) {`
`203`	`203`	`lv.getType().accept(visitor);`
`204`	`204`	`lv.name = visitor.getName();`
`205`	`205`	`}`
`206`		`- lv = lv.next;`
	`206`	`+ lv = lv.getNext();`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`@@ -338,7 +338,7 @@ protected HashMap<Frame, HashSet<AbstractLocalVariable>> createMapForInlineDecla`
`338`	`338`	`variablesToDeclare.add(lv);`
`339`	`339`	`}`
`340`	`340`	`}`
`341`		`- lv = lv.next;`
	`341`	`+ lv = lv.getNext();`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`
`@@ -567,7 +567,7 @@ protected void createStartBlockDeclarations() {`
`567`	`567`	`lv.setDeclared(true);`
`568`	`568`	`}`
`569`	`569`
`570`		`- lv = lv.next;`
	`570`	`+ lv = lv.getNext();`
`571`	`571`	`}`
`572`	`572`	`}`
`573`	`573`	`}`