8006337: Discarded arguments for INVOKESTATIC must still be evaluated for side effects
Reviewed-by: hannesw, jlaskey, sundar
This commit is contained in:
parent
311e57397d
commit
a2efb1b4f5
@ -506,12 +506,11 @@ public final class CodeGenerator extends NodeOperatorVisitor {
|
||||
int n = 0;
|
||||
final Type[] params = signature == null ? null : Type.getMethodArguments(signature);
|
||||
for (final Node arg : args) {
|
||||
if (n >= argCount) {
|
||||
break;
|
||||
}
|
||||
assert arg != null;
|
||||
load(arg);
|
||||
if (params != null) {
|
||||
if (n >= argCount) {
|
||||
method.pop(); // we had to load the arg for its side effects
|
||||
} else if (params != null) {
|
||||
method.convert(params[n]);
|
||||
}
|
||||
n++;
|
||||
|
31
nashorn/test/script/basic/JDK-8006337.js
Normal file
31
nashorn/test/script/basic/JDK-8006337.js
Normal file
@ -0,0 +1,31 @@
|
||||
/*
|
||||
* 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-8006337 : Discarded arguments for INVOKESTATIC must still be
|
||||
* evaluated for side effects.
|
||||
*
|
||||
* @test
|
||||
* @run
|
||||
*/
|
||||
(function() {})(print("hello"))
|
1
nashorn/test/script/basic/JDK-8006337.js.EXPECTED
Normal file
1
nashorn/test/script/basic/JDK-8006337.js.EXPECTED
Normal file
@ -0,0 +1 @@
|
||||
hello
|
Loading…
x
Reference in New Issue
Block a user