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

8225644: C1 dumps incorrect class name in ClassCastException message

Browse Source 
Co-authored-by: Jie Fu <fujie@loongson.cn>
Reviewed-by: vlivanov, bsrbnd
This commit is contained in:
Bernard Blaser 2019-06-25 21:24:37 +02:00
parent aedbb75803
commit 0a1d85e5a3
2 changed files with 48 additions and 2 deletions
src/hotspot/share/runtime
sharedRuntime.cpp
test/hotspot/jtreg/compiler/c1
CCEMessageTest.java

4
src/hotspot/share/runtime/sharedRuntime.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -2020,7 +2020,7 @@ char* SharedRuntime::generate_class_cast_message(
const char* caster_name = caster_klass->external_name();
assert(target_klass != NULL || target_klass_name != NULL, "one must be provided");
const char* target_name = target_klass == NULL ? target_klass_name->as_C_string() :
const char* target_name = target_klass == NULL ? target_klass_name->as_klass_external_name() :
target_klass->external_name();
size_t msglen = strlen(caster_name) + strlen("class ") + strlen(" cannot be cast to class ") + strlen(target_name) + 1;

46
test/hotspot/jtreg/compiler/c1/CCEMessageTest.java Normal file

@ -0,0 +1,46 @@
/*
* 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 8225644
* @summary C1 dumps incorrect class name in CCE message
* @run main/othervm compiler.c1.CCEMessageTest
* @run main/othervm -Xcomp -XX:TieredStopAtLevel=1 compiler.c1.CCEMessageTest
*/
package compiler.c1;
public class CCEMessageTest {
public static void main(String... args) {
String[] s = null;
try {
s = (String[])new Object[1];
} catch (ClassCastException cce) {
if (!cce.getMessage().contains("[Ljava.lang.String;"))
throw new AssertionError("Incorrect CCE message", cce);
}
if (s != null)
throw new AssertionError("Unexpected error");
}
}