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

8242923: Trigger interface MethodHandle resolve in test without Nashorn

Browse Source 
Reviewed-by: iignatyev
This commit is contained in:
Evgeny Nikitin 2020-06-10 13:17:03 +02:00
parent 7e05213271
commit 212ab17635
3 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/ProblemList.txt
View File

@ -70,8 +70,6 @@ compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
compiler/c2/Test8004741.java 8235801 generic-all compiler/c2/Test8004741.java 8235801 generic-all
compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java 8242923 generic-all
############################################################################# #############################################################################
# :hotspot_gc # :hotspot_gc

19
test/hotspot/jtreg/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,19 +24,22 @@
/** /**
* @test * @test
* @bug 8026124 * @bug 8026124
* @summary Javascript file provoked assertion failure in linkResolver.cpp * @summary MethodHandle lookup for an interface method causes assertion failure in linkResolver.cpp
* @modules jdk.scripting.nashorn/jdk.nashorn.tools
* *
* @run main/othervm compiler.jsr292.CreatesInterfaceDotEqualsCallInfo * @run main/othervm compiler.jsr292.CreatesInterfaceDotEqualsCallInfo
*/ */
package compiler.jsr292; package compiler.jsr292;
import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
public class CreatesInterfaceDotEqualsCallInfo { public class CreatesInterfaceDotEqualsCallInfo {
public static void main(String[] args) throws java.io.IOException { public static void main(String[] args) throws Throwable {
String[] jsargs = {System.getProperty("test.src", ".") + MethodHandles.publicLookup()
"/createsInterfaceDotEqualsCallInfo.js"}; .unreflect(Path.class.getMethod("toString", new Class[]{}))
jdk.nashorn.tools.Shell.main(System.in, System.out, System.err, jsargs); .invoke(Path.of("."));
System.out.println("PASS, did not crash running Javascript");
System.out.println("PASS, did not crash calling interface method handle");
} }
} }

26
test/hotspot/jtreg/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js
View File

@ -1,26 +0,0 @@
/*
* Copyright (c) 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.
*
*/
var path = new java.io.File("/Users/someone").toPath();
path.toString();