8027562: eval should load second and subsequent arguments for side effect
Reviewed-by: jlaskey, lagergren
This commit is contained in:
parent
2339f59c14
commit
e6599626c5
nashorn
src/jdk/nashorn/internal/codegen
test/script/basic
@ -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());
|
||||
|
39
nashorn/test/script/basic/JDK-8027562.js
Normal file
39
nashorn/test/script/basic/JDK-8027562.js
Normal file
@ -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);
|
||||
}
|
1
nashorn/test/script/basic/JDK-8027562.js.EXPECTED
Normal file
1
nashorn/test/script/basic/JDK-8027562.js.EXPECTED
Normal file
@ -0,0 +1 @@
|
||||
ReferenceError: "x" is not defined
|
Loading…
x
Reference in New Issue
Block a user