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

8239915: Zero VM crashes when handling dynamic constant

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Kun Wang 2020-02-26 17:32:04 +08:00 committed by Fei Yang
parent 0a820d6d21
commit 742bdf003e
3 changed files with 137 additions and 11 deletions
src/hotspot/share/interpreter
bytecodeInterpreter.cpp
test/hotspot/jtreg/runtime/invokedynamic
DynamicConstantHelper.jasmTestDynamicConstant.java

16
src/hotspot/share/interpreter/bytecodeInterpreter.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2020, 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
@ -2347,11 +2347,8 @@ run:
case JVM_CONSTANT_Dynamic:
{
oop result = constants->resolved_references()->obj_at(index);
if (result == NULL) {
CALL_VM(InterpreterRuntime::resolve_ldc(THREAD, (Bytecodes::Code) opcode), handle_exception);
result = THREAD->vm_result();
}
CALL_VM(InterpreterRuntime::resolve_ldc(THREAD, (Bytecodes::Code) opcode), handle_exception);
oop result = THREAD->vm_result();
VERIFY_OOP(result);
jvalue value;
@ -2391,11 +2388,8 @@ run:
case JVM_CONSTANT_Dynamic:
{
oop result = constants->resolved_references()->obj_at(index);
if (result == NULL) {
CALL_VM(InterpreterRuntime::resolve_ldc(THREAD, (Bytecodes::Code) opcode), handle_exception);
result = THREAD->vm_result();
}
CALL_VM(InterpreterRuntime::resolve_ldc(THREAD, (Bytecodes::Code) opcode), handle_exception);
oop result = THREAD->vm_result();
VERIFY_OOP(result);
jvalue value;

66
test/hotspot/jtreg/runtime/invokedynamic/DynamicConstantHelper.jasm Normal file

@ -0,0 +1,66 @@
/*
* Copyright (c) 2020, Huawei Technologies Co. Ltd. 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.
*
*/
super public class DynamicConstantHelper
version 55:0
{
static Method getDoubleConstant:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;I)D"
stack 2 locals 4
{
dconst_0;
dreturn;
}
static varargs Method getIntConstant:"(Ljava/lang/invoke/MethodHandles$Lookup;[Ljava/lang/Object;)I"
stack 1 locals 2
{
ldc int 6;
ireturn;
}
public static Method "testDoubleConstantDynamic":"()V"
stack 4 locals 1
{
ldc2_w Dynamic REF_invokeStatic:
DynamicConstantHelper.getDoubleConstant:
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Object;I)D":constDynDouble:"D" int 0;
getstatic Field java/lang/System.out:"Ljava/io/PrintStream;";
ldc String "testDoubleConstantDynamic: PASSED";
invokevirtual Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
return;
}
public static Method "testIntConstantDynamic":"()V"
stack 4 locals 1
{
ldc_w Dynamic REF_invokeStatic:
DynamicConstantHelper.getIntConstant:
"(Ljava/lang/invoke/MethodHandles$Lookup;[Ljava/lang/Object;)I":constantdynamic:"I";
getstatic Field java/lang/System.out:"Ljava/io/PrintStream;";
ldc String "testIntConstantDynamic: PASSED";
invokevirtual Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
return;
}
}

66
test/hotspot/jtreg/runtime/invokedynamic/TestDynamicConstant.java Normal file

@ -0,0 +1,66 @@
/*
* Copyright (c) 2020, Huawei Technologies Co. Ltd. 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 8239915
* @compile DynamicConstantHelper.jasm
* @run main TestDynamicConstant
*/
import java.lang.invoke.*;
public class TestDynamicConstant {
static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
static final MethodType TEST_MT = MethodType.methodType(void.class);
static final Class<?> TEST_CLASS;
static {
try {
TEST_CLASS = Class.forName("DynamicConstantHelper");
} catch (ClassNotFoundException e) {
throw new Error(e);
}
}
static void test(String testName, Class<? extends Throwable> expectedError) {
try {
LOOKUP.findStatic(TEST_CLASS, testName, TEST_MT).invokeExact();
} catch (Throwable e) {
if (expectedError.isInstance(e)) {
// expected
} else {
e.printStackTrace();
String msg = String.format("%s: wrong exception: %s, but %s expected",
testName, e.getClass().getName(), expectedError.getName());
throw new AssertionError(msg);
}
}
}
public static void main(String[] args) throws Throwable {
test("testDoubleConstantDynamic", NoSuchMethodError.class);
test("testIntConstantDynamic", NoSuchMethodError.class);
}
}