Wed, 30 Oct 2013 20:09:44 +0530
8027562: eval should load second and subsequent arguments for side effect
Reviewed-by: jlaskey, lagergren
1.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Oct 30 11:28:46 2013 -0300 1.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Oct 30 20:09:44 2013 +0530 1.3 @@ -706,6 +706,12 @@ 1.4 final CallNode.EvalArgs evalArgs = callNode.getEvalArgs(); 1.5 // load evaluated code 1.6 load(evalArgs.getCode(), Type.OBJECT); 1.7 + // load second and subsequent args for side-effect 1.8 + final List<Expression> args = callNode.getArgs(); 1.9 + final int numArgs = args.size(); 1.10 + for (int i = 1; i < numArgs; i++) { 1.11 + load(args.get(i)).pop(); 1.12 + } 1.13 // special/extra 'eval' arguments 1.14 load(evalArgs.getThis()); 1.15 method.load(evalArgs.getLocation());
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/script/basic/JDK-8027562.js Wed Oct 30 20:09:44 2013 +0530 2.3 @@ -0,0 +1,39 @@ 2.4 +/* 2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +/** 2.28 + * JDK-8027562: eval should load second and subsequent arguments for side effect 2.29 + * 2.30 + * @test 2.31 + * @run 2.32 + */ 2.33 + 2.34 +try { 2.35 + eval("", x); 2.36 + fail("should have thrown ReferenceError for 'x'"); 2.37 +} catch (e) { 2.38 + if (! (e instanceof ReferenceError)) { 2.39 + fail("Expected ReferenceError, got " + e); 2.40 + } 2.41 + print(e); 2.42 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/script/basic/JDK-8027562.js.EXPECTED Wed Oct 30 20:09:44 2013 +0530 3.3 @@ -0,0 +1,1 @@ 3.4 +ReferenceError: "x" is not defined