8057019: Various problems with extra arguments to applies
Reviewed-by: attila, hannesw, jlaskey
diff --git a/nashorn/bin/fixorphantests.sh b/nashorn/bin/fixorphantests.sh
deleted file mode 100644
index 604e2da..0000000
--- a/nashorn/bin/fixorphantests.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-#ensure that all tests tagged with @test are also tagged with @run
-
-for f in $(find test/script/basic/*.js); do
- grep @test $f >/dev/null
- TEST=$?
- grep @run $f >/dev/null
- RUN=$?
-
- if [ $TEST -eq 0 ] && [ ! $RUN -eq 0 ]; then
- echo "repairing ${f}..."
- TEMP=$(mktemp /tmp/scratch.XXXXXX)
-
- #IFS='', -raw flag to preserve white space
- while IFS='' read -r line; do
- echo $line | grep @test >/dev/null
- TEST=$?
- printf "%s\n" "$line"
- if [ $TEST -eq 0 ]; then
- printf "%s\n" "$line" | sed s/@test/@run/g
- fi
- done < $f >$TEMP
-
- cp $TEMP $f
-
- rm -fr $TEMP
- fi
-
-done
diff --git a/nashorn/bin/fixwhitespace.sh b/nashorn/bin/fixwhitespace.sh
deleted file mode 100644
index d327470..0000000
--- a/nashorn/bin/fixwhitespace.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-fix() {
- #convert tabs to spaces
- find . -name $1 -exec sed -i "" 's/ / /g' {} \;
- #remove trailing whitespace
- find . -name $1 -exec sed -i "" 's/[ ]*$//' \{} \;
-}
-
-if [ ! -z $1 ]; then
- fix $1;
-else
- fix "*.java"
- fix "*.js"
-fi
diff --git a/nashorn/bin/jjsdebug.sh b/nashorn/bin/jjsdebug.sh
deleted file mode 100644
index 509700c..0000000
--- a/nashorn/bin/jjsdebug.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2014, 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.
-#
-
-$JAVA_HOME/bin/jjs -J-Djava.ext.dirs=`dirname $0`/../dist -J-agentlib:jdwp=transport=dt_socket,address=localhost:9009,server=y,suspend=y $*
diff --git a/nashorn/bin/rm-non-tracked.sh b/nashorn/bin/rm-non-tracked.sh
deleted file mode 100644
index 1eac199..0000000
--- a/nashorn/bin/rm-non-tracked.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-hg status|grep ^\?|awk '{print $2}'|xargs rm
diff --git a/nashorn/bin/run_octane.sh b/nashorn/bin/run_octane.sh
deleted file mode 100644
index a50137f0..0000000
--- a/nashorn/bin/run_octane.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2010, 2014, 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.
-#
-
-LOG="./octane_$(date|sed "s/ /_/g"|sed "s/:/_/g").log"
-
-run_one() {
- sh ../bin/runopt.sh -scripting ../test/script/basic/run-octane.js -- $1 --verbose --iterations 25 | tee -a $LOG
-}
-
-if [ -z $1 ]; then
-
- run_one "box2d"
- run_one "code-load"
- run_one "crypto"
- run_one "deltablue"
- run_one "earley-boyer"
- run_one "gbemu"
- run_one "mandreel"
- run_one "navier-stokes"
- run_one "pdfjs"
- run_one "raytrace"
- run_one "regexp"
- run_one "richards"
- run_one "splay"
- run_one "typescript"
- run_one "zlib"
-
-else
- run_one $1
-fi
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 81863bd..d9f71a2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -36,6 +36,7 @@
import java.lang.invoke.MethodType;
import java.lang.invoke.SwitchPoint;
import java.util.Collections;
+
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
@@ -44,6 +45,9 @@
import jdk.nashorn.internal.codegen.CompilerConstants.Call;
import jdk.nashorn.internal.objects.Global;
import jdk.nashorn.internal.objects.NativeFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
@@ -621,6 +625,23 @@
appliedType = appliedType.changeParameterType(1, Object.class);
}
+ /*
+ * dropArgs is a synthetic method handle that contains any args that we need to
+ * get rid of that come after the arguments array in the apply case. We adapt
+ * the callsite to ask for 3 args only and then dropArguments on the method handle
+ * to make it fit the extraneous args.
+ */
+ MethodType dropArgs = MH.type(void.class);
+ if (isApply && !isFailedApplyToCall) {
+ final int pc = appliedType.parameterCount();
+ for (int i = 3; i < pc; i++) {
+ dropArgs = dropArgs.appendParameterTypes(appliedType.parameterType(i));
+ }
+ if (pc > 3) {
+ appliedType = appliedType.dropParameterTypes(3, pc);
+ }
+ }
+
if (isApply || isFailedApplyToCall) {
if (passesArgs) {
// R(this, args) => R(this, Object[])
@@ -702,6 +723,15 @@
}
inv = MH.dropArguments(inv, 0, applyFnType);
+ /*
+ * Dropargs can only be non-()V in the case of isApply && !isFailedApplyToCall, which
+ * is when we need to add arguments to the callsite to catch and ignore the synthetic
+ * extra args that someone has added to the command line.
+ */
+ for (int i = 0; i < dropArgs.parameterCount(); i++) {
+ inv = MH.dropArguments(inv, 4 + i, dropArgs.parameterType(i));
+ }
+
MethodHandle guard = appliedInvocation.getGuard();
// If the guard checks the value of "this" but we aren't passing thisArg, insert the default one
if (!passesThis && guard.type().parameterCount() > 1) {
diff --git a/nashorn/test/script/basic/JDK-8057019-2.js b/nashorn/test/script/basic/JDK-8057019-2.js
new file mode 100644
index 0000000..416acba
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8057019-2.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2014, 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.
+ */
+
+/**
+ * this apply with extra arguments
+ * (with apply to call enabled)
+ *
+ * @test
+ * @run
+ */
+
+load(__DIR__ + 'JDK-8057019-payload.js');
+
diff --git a/nashorn/test/script/basic/JDK-8057019-2.js.EXPECTED b/nashorn/test/script/basic/JDK-8057019-2.js.EXPECTED
new file mode 100644
index 0000000..34587ce
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8057019-2.js.EXPECTED
@@ -0,0 +1,24 @@
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+TypeError: Function.prototype.apply expects an Array for second argument
+TypeError: Function.prototype.apply expects an Array for second argument
+TypeError: Function.prototype.apply expects an Array for second argument
diff --git a/nashorn/test/script/basic/JDK-8057019-payload.js b/nashorn/test/script/basic/JDK-8057019-payload.js
new file mode 100644
index 0000000..e62e51f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8057019-payload.js
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010, 2014, 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.
+ */
+
+/**
+ * this apply with extra arguments
+ *
+ * @subtest
+ */
+
+function func(x, y, z) {
+ print(x, y, z);
+}
+
+function g() {
+ func.apply(this, arguments);
+}
+function h() {
+ func.apply(this, arguments, 23);
+}
+function i() {
+ func.apply(this, arguments, 23, 4711);
+}
+function j() {
+ func.apply(this, arguments, 23, 4711, "apa", "dingo", "gorilla");
+}
+function k() {
+ func.apply(this, arguments, 23);
+}
+function l() {
+ func.apply(this, [23, "apa", "gorilla", "dingo"], 17);
+}
+function m() {
+ func.apply(this, [23, "apa", "gorilla", "dingo"]);
+}
+function n() {
+ func.apply(this, "significant");
+}
+
+g(1,2);
+g(1,2,3);
+g(1,2,3,4);
+
+h(1,2);
+h(1,2,3);
+h(1,2,3,4);
+
+i(1,2);
+i(1,2,3);
+i(1,2,3,4);
+
+j(1,2);
+j(1,2,3);
+j(1,2,3,4);
+
+k(1,2);
+k(1,2,3);
+k(1,2,3,4);
+
+l(1,2);
+l(1,2,3);
+l(1,2,3,4);
+
+m(1,2);
+m(1,2,3);
+m(1,2,3,4);
+
+try {
+ n(1,2);
+} catch (e) {
+ print(e);
+}
+try {
+ n(1,2,3);
+} catch (e) {
+ print(e);
+}
+
+try {
+ n(1,2,3,4);
+} catch (e) {
+ print(e);
+}
diff --git a/nashorn/test/script/basic/JDK-8057019.js b/nashorn/test/script/basic/JDK-8057019.js
new file mode 100644
index 0000000..16b308e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8057019.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2014, 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.
+ */
+
+/**
+ * this apply with extra arguments
+ * (turning off apply to call)
+ *
+ * @fork
+ * @option -Dnashorn.apply2call=false
+ * @test
+ * @run
+ */
+
+load(__DIR__ + 'JDK-8057019-payload.js');
+
diff --git a/nashorn/test/script/basic/JDK-8057019.js.EXPECTED b/nashorn/test/script/basic/JDK-8057019.js.EXPECTED
new file mode 100644
index 0000000..34587ce
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8057019.js.EXPECTED
@@ -0,0 +1,24 @@
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+1 2 undefined
+1 2 3
+1 2 3
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+23 apa gorilla
+TypeError: Function.prototype.apply expects an Array for second argument
+TypeError: Function.prototype.apply expects an Array for second argument
+TypeError: Function.prototype.apply expects an Array for second argument
diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED b/nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED
index ce3b360..41ad10b 100644
--- a/nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED
+++ b/nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED
@@ -15,8 +15,8 @@
2.3
3.4
test 5 done
-a=object
-17
+a=number
+22
undefined
Now it's time for transforms
19
