From ab9e5f1877721436770494961523f8642da85a7a Mon Sep 17 00:00:00 2001
From: sundar <unknown>
Date: Wed, 30 Oct 2013 20:09:44 +0530
Subject: [PATCH] 8027562: eval should load second and subsequent arguments for
 side effect Reviewed-by: jlaskey, lagergren

---
 .../internal/codegen/CodeGenerator.java       |  6 +++
 test/script/basic/JDK-8027562.js              | 39 +++++++++++++++++++
 test/script/basic/JDK-8027562.js.EXPECTED     |  1 +
 3 files changed, 46 insertions(+)
 create mode 100644 test/script/basic/JDK-8027562.js
 create mode 100644 test/script/basic/JDK-8027562.js.EXPECTED

diff --git a/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 3ac5cd0d..206433db 100644
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -706,6 +706,12 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
                 final CallNode.EvalArgs evalArgs = callNode.getEvalArgs();
                 // load evaluated code
                 load(evalArgs.getCode(), Type.OBJECT);
+                // load second and subsequent args for side-effect
+                final List<Expression> args = callNode.getArgs();
+                final int numArgs = args.size();
+                for (int i = 1; i < numArgs; i++) {
+                    load(args.get(i)).pop();
+                }
                 // special/extra 'eval' arguments
                 load(evalArgs.getThis());
                 method.load(evalArgs.getLocation());
diff --git a/test/script/basic/JDK-8027562.js b/test/script/basic/JDK-8027562.js
new file mode 100644
index 00000000..950584b4
--- /dev/null
+++ b/test/script/basic/JDK-8027562.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, 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-8027562: eval should load second and subsequent arguments for side effect
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("", x);
+    fail("should have thrown ReferenceError for 'x'");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("Expected ReferenceError, got " + e);
+    }
+    print(e);
+}
diff --git a/test/script/basic/JDK-8027562.js.EXPECTED b/test/script/basic/JDK-8027562.js.EXPECTED
new file mode 100644
index 00000000..c007ed7b
--- /dev/null
+++ b/test/script/basic/JDK-8027562.js.EXPECTED
@@ -0,0 +1 @@
+ReferenceError: "x" is not defined
-- 
GitLab