changeset 1993:bd933afd9e2e jdk-10+22

8184720: Nashorn engine in strict mode throws a java.lang.ClassCastException when calling apply() and passing the arguments object Summary: Fixed needsCallee method to return true properly in strict mode Reviewed-by: hannesw, sundar Contributed-by: srinivas.dama@oracle.com
author sdama
date Fri, 01 Sep 2017 07:55:00 +0530
parents 545d7d2a70a8
children bea304c9ee43
files src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java test/script/basic/JDK-8184720.js
diffstat 3 files changed, 43 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java	Fri Sep 01 07:07:11 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java	Fri Sep 01 07:55:00 2017 +0530
@@ -722,7 +722,7 @@
      */
     public boolean needsCallee() {
         // NOTE: we only need isSplit() here to ensure that :scope can never drop below slot 2 for splitting array units.
-        return needsParentScope() || usesSelfSymbol() || isSplit() || (needsArguments() && !isStrict()) || hasApplyToCallSpecialization();
+        return needsParentScope() || usesSelfSymbol() || isSplit() || ((needsArguments() || hasApplyToCallSpecialization()) && !isStrict());
     }
 
     /**
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java	Fri Sep 01 07:07:11 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java	Fri Sep 01 07:55:00 2017 +0530
@@ -338,17 +338,20 @@
      * @return apply to call that perfectly fits this callsite or null if none found
      */
     CompiledFunction lookupExactApplyToCall(final MethodType type) {
+        // Callsite type always has callee, drop it if this function doesn't need it.
+        final MethodType adaptedType = needsCallee() ? type : type.dropParameterTypes(0, 1);
+
         for (final CompiledFunction cf : code) {
             if (!cf.isApplyToCall()) {
                 continue;
             }
 
             final MethodType cftype = cf.type();
-            if (cftype.parameterCount() != type.parameterCount()) {
+            if (cftype.parameterCount() != adaptedType.parameterCount()) {
                 continue;
             }
 
-            if (widen(cftype).equals(widen(type))) {
+            if (widen(cftype).equals(widen(adaptedType))) {
                 return cf;
             }
         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8184720.js	Fri Sep 01 07:55:00 2017 +0530
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, 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-8184720: Nashorn engine in strict mode throws a java.lang.ClassCastException
+ * when calling apply() and passing the arguments object
+ *
+ * @test
+ * @run
+ * @option -strict
+ */
+
+var yfunc = function () {
+    (function(){}).apply(null, arguments);
+};
+
+yfunc();