changeset 30:9088170e68df

8006337: Discarded arguments for INVOKESTATIC must still be evaluated for side effects Reviewed-by: hannesw, jlaskey, sundar
author attila
date Tue, 15 Jan 2013 18:08:50 +0100
parents ee73d7378e3e
children 617313881c55
files src/jdk/nashorn/internal/codegen/CodeGenerator.java test/script/basic/JDK-8006337.js test/script/basic/JDK-8006337.js.EXPECTED
diffstat 3 files changed, 35 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Tue Jan 15 17:09:44 2013 +0100
+++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Tue Jan 15 18:08:50 2013 +0100
@@ -506,12 +506,11 @@
         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++;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8006337.js	Tue Jan 15 18:08:50 2013 +0100
@@ -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"))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8006337.js.EXPECTED	Tue Jan 15 18:08:50 2013 +0100
@@ -0,0 +1,1 @@
+hello