Fix const declarations in function scopes

The code to avoid duplicate const assignments is no longer needed, as the Parser generates an error for it.
ChatTriggers · Dec 25, 2023 · 9826483 · 9826483
1 parent 96d0c07
commit 9826483
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/src/main/java/org/mozilla/javascript/Node.java b/src/main/java/org/mozilla/javascript/Node.java
@@ -7,7 +7,6 @@
 package org.mozilla.javascript;
 
 import org.mozilla.javascript.ast.*;
-import org.mozilla.javascript.optimizer.Codegen;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -67,7 +66,8 @@ public class Node implements Iterable<Node> {
             PRIVATE_ACCESS_PROP = 34,
             EXPORT_PROP = 35,
             INITIALIZE_PROP = 36,
-            PARTIAL_PROP = 37;
+            PARTIAL_PROP = 37,
+            CONST_DECL_PROP = 38;
 
     // values of ISNUMBER_PROP to specify
     // which of the children are Number types

diff --git a/src/main/java/org/mozilla/javascript/optimizer/Codegen.java b/src/main/java/org/mozilla/javascript/optimizer/Codegen.java
@@ -6045,15 +6045,7 @@ private void visitSetVar(Node node, Node child, boolean needValue) {
         generateExpression(child.getNext(), node);
         boolean isNumber = (node.getIntProp(Node.ISNUMBER_PROP, -1) != -1);
         short reg = varRegisters[varIndex];
-        boolean[] constDeclarations = fnCurrent.fnode.getParamAndVarConst();
-        if (constDeclarations[varIndex]) {
-            if (!needValue) {
-                if (isNumber)
-                    cfw.add(ByteCode.POP2);
-                else
-                    cfw.add(ByteCode.POP);
-            }
-        } else if (varIsDirectCallParameter(varIndex)) {
+        if (varIsDirectCallParameter(varIndex)) {
             if (isNumber) {
                 if (needValue) cfw.add(ByteCode.DUP2);
                 cfw.addALoad(reg);
@@ -6102,40 +6094,17 @@ private void visitSetConstVar(Node node, Node child, boolean needValue) {
         generateExpression(child.getNext(), node);
         boolean isNumber = (node.getIntProp(Node.ISNUMBER_PROP, -1) != -1);
         short reg = varRegisters[varIndex];
-        int beyond = cfw.acquireLabel();
-        int noAssign = cfw.acquireLabel();
         if (isNumber) {
-            cfw.addILoad(reg + 2);
-            cfw.add(ByteCode.IFNE, noAssign);
-            short stack = cfw.getStackTop();
-            cfw.addPush(1);
-            cfw.addIStore(reg + 2);
             cfw.addDStore(reg);
             if (needValue) {
                 cfw.addDLoad(reg);
-                cfw.markLabel(noAssign, stack);
-            } else {
-                cfw.add(ByteCode.GOTO, beyond);
-                cfw.markLabel(noAssign, stack);
-                cfw.add(ByteCode.POP2);
             }
         } else {
-            cfw.addILoad(reg + 1);
-            cfw.add(ByteCode.IFNE, noAssign);
-            short stack = cfw.getStackTop();
-            cfw.addPush(1);
-            cfw.addIStore(reg + 1);
             cfw.addAStore(reg);
             if (needValue) {
                 cfw.addALoad(reg);
-                cfw.markLabel(noAssign, stack);
-            } else {
-                cfw.add(ByteCode.GOTO, beyond);
-                cfw.markLabel(noAssign, stack);
-                cfw.add(ByteCode.POP);
             }
         }
-        cfw.markLabel(beyond);
     }
 
     private void visitGetProp(Node node, Node child) {