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

8310297: assert(static_cast<T1>(result) == thing) with ctw

Browse Source 
Reviewed-by: iklam, dholmes
This commit is contained in:
Coleen Phillimore 2023-06-21 11:45:37 +00:00
parent 574c6f0ebf
commit 70e1c92a7f
3 changed files with 97 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/share/classfile/javaClasses.cpp
View File

@ -817,16 +817,16 @@ static void initialize_static_primitive_field(fieldDescriptor* fd, Handle mirror
BasicType t = fd->field_type();
switch (t) {
case T_BYTE:
mirror()->byte_field_put(fd->offset(), checked_cast<jbyte>(fd->int_initial_value()));
mirror()->byte_field_put(fd->offset(), (jbyte)(fd->int_initial_value()));
break;
case T_BOOLEAN:
mirror()->bool_field_put(fd->offset(), checked_cast<jboolean>(fd->int_initial_value()));
mirror()->bool_field_put(fd->offset(), (jboolean)(fd->int_initial_value()));
break;
case T_CHAR:
mirror()->char_field_put(fd->offset(), checked_cast<jchar>(fd->int_initial_value()));
mirror()->char_field_put(fd->offset(), (jchar)(fd->int_initial_value()));
break;
case T_SHORT:
mirror()->short_field_put(fd->offset(), checked_cast<jshort>(fd->int_initial_value()));
mirror()->short_field_put(fd->offset(), (jshort)(fd->int_initial_value()));
break;
case T_INT:
mirror()->int_field_put(fd->offset(), fd->int_initial_value());

55
test/hotspot/jtreg/runtime/ConstantPool/ByteFieldInitTest.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2023, 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 8310297
* @summary Negative fields shorter than an int may not be sign extended in cpool
* but should in static field initializers. javac gives an error for this but
* not other sources of bytecodes. With checked_cast<> this crashes.
* @compile CompatByteFieldInit.jasm
* @run main ByteFieldInitTest
*/
import java.lang.reflect.Field;
public class ByteFieldInitTest {
final static byte b = -128; // compare with 0x80
final static short s = -32768; // compare with 0x8000
public static void main(java.lang.String[] unused) throws Exception {
// javac is smart enough to complain about the other class's byte and short values when referred
// to directly. With checked_cast<> loading this class should fail.
Class<?> c = Class.forName("CompatByteFieldInit");
Field cb = c.getDeclaredField("b");
Field cs = c.getDeclaredField("s");
if (b != cb.getByte(null) || s != cs.getShort(null)) {
throw new RuntimeException("constant pool init not compatible " + cb.getByte(null) + " " + cs.getShort(null));
} else {
System.out.println("Fields are same test passed");
}
}
}

38
test/hotspot/jtreg/runtime/ConstantPool/CompatByteFieldInit.jasm Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (c) 2023, 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.
*/
super class CompatByteFieldInit
version 65:0
{
public static final Field b:B = int 0x80;
public static final Field s:S = int 0x8000;
Method "<init>":"()V"
stack 1 locals 1
{
aload_0;
invokespecial Method java/lang/Object."<init>":"()V";
return;
}
} // end Class CompatByteFieldInit