stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8184720: Nashorn engine in strict mode throws a java.lang.ClassCastException when calling apply() and passing the arguments object

Browse Source 
Fixed needsCallee method to return true properly in strict mode

Reviewed-by: hannesw, sundar
This commit is contained in:
Srinivas Dama 2017-09-01 07:55:00 +05:30 committed by Srinivas Dama
parent be533f1e54
commit 81752d9a5d
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
View File

@ -722,7 +722,7 @@ public final class FunctionNode extends LexicalContextExpression implements Flag
*/
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());
}
/**

7
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
View File

@ -338,17 +338,20 @@ public abstract class ScriptFunctionData implements Serializable {
* @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;
}
}

37
nashorn/test/script/basic/JDK-8184720.js Normal file
View File

@ -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();