From 4885f66a0367bd890b871a451f3dcb3d778cb3c1 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <szegedia@gmail.com>
Date: Tue, 15 Dec 2020 13:46:36 +0100
Subject: [PATCH] Don't hoist block-scoped variables from dead code

---
 .../internal/codegen/FoldConstants.java       |  4 +-
 test/nashorn/script/basic/es6/JDK-8233195.js  | 40 +++++++++++++++++++
 .../script/basic/es6/JDK-8233195.js.EXPECTED  |  1 +
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 test/nashorn/script/basic/es6/JDK-8233195.js
 create mode 100644 test/nashorn/script/basic/es6/JDK-8233195.js.EXPECTED

diff --git a/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
index 3f7d2ccf..83ac9a7a 100644
--- a/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
@@ -195,7 +195,9 @@ static void extractVarNodesFromDeadCode(final Node deadCodeRoot, final List<Stat
         deadCodeRoot.accept(new SimpleNodeVisitor() {
             @Override
             public boolean enterVarNode(final VarNode varNode) {
-                statements.add(varNode.setInit(null));
+                if (!varNode.isBlockScoped()) {
+                    statements.add(varNode.setInit(null));
+                }
                 return false;
             }
 
diff --git a/test/nashorn/script/basic/es6/JDK-8233195.js b/test/nashorn/script/basic/es6/JDK-8233195.js
new file mode 100644
index 00000000..c4778562
--- /dev/null
+++ b/test/nashorn/script/basic/es6/JDK-8233195.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8233195: SyntaxError in constant folding with block scoped vars
+ *
+ * @test
+ * @run
+ * @option --language=es6
+ */
+
+function x() {
+    if (true) { throw "test"; } { let x = "1"; } { let x = 2; }
+}
+
+try {
+    x();
+} catch(e) {
+    print("Caught: " + e);
+}
diff --git a/test/nashorn/script/basic/es6/JDK-8233195.js.EXPECTED b/test/nashorn/script/basic/es6/JDK-8233195.js.EXPECTED
new file mode 100644
index 00000000..a99ab76e
--- /dev/null
+++ b/test/nashorn/script/basic/es6/JDK-8233195.js.EXPECTED
@@ -0,0 +1 @@
+Caught: test