Fix var clashing not processing foreach properly

Vineflower · Aug 1, 2023 · 7f65ce7 · 7f65ce7
1 parent eb95dad
commit 7f65ce7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -439,7 +439,7 @@ public boolean allowNewlineAfterQualifier() {
 
   @Override
   public String toString() {
-    return "VarExprent[" + index + ',' + version +"]: {" + super.toString() + "}";
+    return "VarExprent[" + index + ',' + version + (definition ? " Def" : "") + "]: {" + super.toString() + "}";
   }
 
   // *****************************************************************************

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -1355,15 +1355,13 @@ public void remapClashingNames(Statement root) {
     Set<VarVersionPair> liveVarDefs = new HashSet<>();
     Map<VarVersionPair, String> nameMap = new HashMap<>();
 
-    if (root instanceof RootStatement) {
-      StructMethodParametersAttribute paramAttribute = ((RootStatement) root).mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
-      StructLocalVariableTableAttribute lvtAttribute = ((RootStatement) root).mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-      if (paramAttribute != null && lvtAttribute != null) {
-        for (StructMethodParametersAttribute.Entry entry : paramAttribute.getEntries()) {
-          // for every method param, find lvt entry and put it into the name map
-          Optional<LocalVariable> lvtEntry = lvtAttribute.getVariables().filter(s -> s.getName().equals(entry.myName)).findFirst();
-          lvtEntry.ifPresent(localVariable -> nameMap.put(localVariable.getVersion(), entry.myName));
-        }
+    StructMethodParametersAttribute paramAttribute = ((RootStatement) root).mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
+    StructLocalVariableTableAttribute lvtAttribute = ((RootStatement) root).mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+    if (paramAttribute != null && lvtAttribute != null) {
+      for (StructMethodParametersAttribute.Entry entry : paramAttribute.getEntries()) {
+        // for every method param, find lvt entry and put it into the name map
+        Optional<LocalVariable> lvtEntry = lvtAttribute.getVariables().filter(s -> s.getName().equals(entry.myName)).findFirst();
+        lvtEntry.ifPresent(localVariable -> nameMap.put(localVariable.getVersion(), entry.myName));
       }
     }
 
@@ -1389,7 +1387,7 @@ private void iterateClashingNames(Statement stat, Map<Statement, Set<VarVersionP
       // Process var definitions in statement head
       for (Object obj : stat.getSequentialObjects()) {
         if (obj instanceof Exprent) {
-          List<Exprent> exprents = ((Exprent) obj).getAllExprents(true);
+          List<Exprent> exprents = ((Exprent) obj).getAllExprents(true, true);
 
           for (Exprent exprent : exprents) {
             iterateClashingExprent(stat, varDefinitions, exprent, curVarDefs, nameMap);

diff --git a/testData/results/TestJadLvtCollision.dec b/testData/results/TestJadLvtCollision.dec
@@ -7,8 +7,8 @@ public class TestJadLvtCollision implements Iterable<TestJadLvtCollision> {
    }// 10
 
    public void testLoop(TestJadLvtCollision testjadlvtcollision) {
-      for(TestJadLvtCollision testjadlvtcollision : testjadlvtcollision) {// 13
-         System.out.println(testjadlvtcollision.toString() + testjadlvtcollision.toString());// 14
+      for(TestJadLvtCollision testjadlvtcollisionx : testjadlvtcollision) {// 13
+         System.out.println(testjadlvtcollision.toString() + testjadlvtcollisionx.toString());// 14
       }
    }// 16
 
@@ -91,4 +91,4 @@ Lines mapping:
 16 <-> 13
 20 <-> 16
 Not mapped:
-15
+15