darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-12-02 17:36:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8228485: JVM crashes when bootstrap method for condy triggers loading of class whose static initializer throws exception

Browse Source 
Add case for JVM_CONSTANT_Dynamic in error_message function.

Reviewed-by: dholmes, shade
This commit is contained in:
Coleen Phillimore 2019-07-24 10:22:11 -04:00
parent f2e1bfa38a
commit 221da20713
4 changed files with 155 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/oops/constantPool.cpp
View File

@ -760,6 +760,10 @@ Symbol* ConstantPool::exception_message(const constantPoolHandle& this_cp, int w
// return the method type signature in the error message
message = this_cp->method_type_signature_at(which);
break;
case JVM_CONSTANT_Dynamic:
// return the name of the condy in the error message
message = this_cp->uncached_name_ref_at(which);
break;
default:
ShouldNotReachHere();
}

65
test/hotspot/jtreg/runtime/condy/staticInit/Example.jasm Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2019, 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 class gets an initialization error in a condy invokestatic. Need jasm so that StaticInit isn't
// initialized before the condy call.
// Test that second invocation gets same error as first.
public class Example
version 55:0
{
static Method $jacocoInit:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;"
stack 1 locals 3
{
invokestatic Method StaticInit.get:"()Ljava/lang/Object;";
areturn;
}
public static Method foo:"()V"
stack 1 locals 2
{
ldc Dynamic REF_invokeStatic:Example.$jacocoInit:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;":$jacocoData:"Ljava/lang/Object;";
astore_1;
return;
}
public static Method main:"([Ljava/lang/String;)V"
stack 1 locals 2
{
try t0;
invokestatic Method Example.foo:"()V";
endtry t0;
goto L7;
catch t0 java/lang/Error;
stack_frame_type stack1;
stack_map class java/lang/Error;
astore_1;
aload_1;
invokevirtual Method java/lang/Error.printStackTrace:"()V";
L7: stack_frame_type same;
invokestatic Method Example.foo:"()V";
return;
}
} // end Class Example

33
test/hotspot/jtreg/runtime/condy/staticInit/StaticInit.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2019, 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.
*/
class StaticInit {
static {
if (true)
throw new RuntimeException();
}
static Object get() {
return new Object();
}
}

53
test/hotspot/jtreg/runtime/condy/staticInit/TestInitException.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2019, 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.
*/
/*
* @test
* @bug 8228485
* @summary Correctly handle initialization error for Condy BSM.
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile Example.jasm
* @compile StaticInit.java
* @run main/othervm TestInitException
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestInitException {
public static void main(java.lang.String[] unused) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("Example");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());
// First call stack trace
oa.shouldContain("at Example.$jacocoInit(Example.jasm)");
oa.shouldContain("Caused by: java.lang.RuntimeException");
oa.shouldContain("at StaticInit.<clinit>(StaticInit.java:27)");
// Second call stack trace, with the message
oa.shouldContain("java.lang.ExceptionInInitializerError: $jacocoData");
oa.shouldContain("at Example.foo(Example.jasm)");
oa.shouldContain("at Example.main(Example.jasm)");
oa.shouldHaveExitValue(1);
}
}