infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-23 14:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

8172006: Nashorn JavaScript engine fails to call @FunctionalInterface with a java.util.List argument

Browse Source 
Reviewed-by: attila, jlaskey
This commit is contained in:
Hannes Wallnöfer 2017-01-26 12:58:57 +01:00
parent a043135fe4
commit bd7de57d55
3 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
View File

@ -147,9 +147,8 @@ public class NashornBeansLinker implements GuardingDynamicLinker {
new NashornBeansLinkerServices(linkerServices));
// Bind to the method, drop the original "this" and use original "callee" as this:
final MethodHandle inv = linkerServices.filterInternalObjects(gi
.getInvocation() // (method, this, args...)
.bindTo(method)); // (this, args...)
final MethodHandle inv = gi.getInvocation() // (method, this, args...)
.bindTo(method); // (this, args...)
final MethodHandle calleeToThis = MH.dropArguments(inv, 1, callType.parameterType(1)); // (callee->this, <drop>, args...)
return gi.replaceMethods(calleeToThis, gi.getGuard());
}

40
nashorn/test/script/basic/JDK-8172006.js Normal file
View File

@ -0,0 +1,40 @@
/*
* 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-8172006: Nashorn JavaScript engine fails to call @FunctionalInterface with a java.util.List argument
*
* @test
* @run
*/
var f = Java.type("jdk.nashorn.test.models.FunctionalInterfaceProvider").getImpl();
var s = "a";
s += "b";
var o = { p: 10 };
var a = [1, 2, 3];
f([ f([]), f([]), f([]), f([]), f([]), f([]), f([]), f([]) ]);
f([ f([]), f([ f([]), f([f([]), f([]), f([]) ]), f([])]), f([]) ]);
f([ f([s]), f([o]), f([a]), f([s + "c"]), f([o]), f([a]) ]);

53
nashorn/test/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java Normal file
View File

@ -0,0 +1,53 @@
/*
* 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.nashorn.test.models;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.testng.Assert;
import java.util.List;
public class FunctionalInterfaceProvider {
private final static Object RETURN_TOKEN = new Object();
public static Functional getImpl() {
return (l) -> {
// Make sure parameters are properly exported
for (final Object o : l) {
Assert.assertTrue(o == RETURN_TOKEN
|| o instanceof ScriptObjectMirror
|| o instanceof String);
}
return RETURN_TOKEN;
};
}
@FunctionalInterface
public interface Functional {
Object method(List<Object> args);
}
}