mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8337622: IllegalArgumentException in java.lang.reflect.Field.get
Reviewed-by: dholmes, shade
This commit is contained in:
parent
2ca136a7ad
commit
41e31d6b0a
3 changed files with 51 additions and 7 deletions
|
@ -1452,19 +1452,12 @@ void java_lang_Class::compute_offsets() {
|
||||||
|
|
||||||
InstanceKlass* k = vmClasses::Class_klass();
|
InstanceKlass* k = vmClasses::Class_klass();
|
||||||
CLASS_FIELDS_DO(FIELD_COMPUTE_OFFSET);
|
CLASS_FIELDS_DO(FIELD_COMPUTE_OFFSET);
|
||||||
|
|
||||||
// Init lock is a C union with component_mirror. Only instanceKlass mirrors have
|
|
||||||
// init_lock and only ArrayKlass mirrors have component_mirror. Since both are oops
|
|
||||||
// GC treats them the same.
|
|
||||||
_init_lock_offset = _component_mirror_offset;
|
|
||||||
|
|
||||||
CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
|
CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if INCLUDE_CDS
|
#if INCLUDE_CDS
|
||||||
void java_lang_Class::serialize_offsets(SerializeClosure* f) {
|
void java_lang_Class::serialize_offsets(SerializeClosure* f) {
|
||||||
f->do_bool(&_offsets_computed);
|
f->do_bool(&_offsets_computed);
|
||||||
f->do_u4((u4*)&_init_lock_offset);
|
|
||||||
|
|
||||||
CLASS_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
|
CLASS_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
|
||||||
|
|
||||||
|
|
|
@ -209,6 +209,7 @@ class java_lang_String : AllStatic {
|
||||||
macro(java_lang_Class, static_oop_field_count, int_signature, false) \
|
macro(java_lang_Class, static_oop_field_count, int_signature, false) \
|
||||||
macro(java_lang_Class, protection_domain, object_signature, false) \
|
macro(java_lang_Class, protection_domain, object_signature, false) \
|
||||||
macro(java_lang_Class, source_file, object_signature, false) \
|
macro(java_lang_Class, source_file, object_signature, false) \
|
||||||
|
macro(java_lang_Class, init_lock, object_signature, false)
|
||||||
|
|
||||||
class java_lang_Class : AllStatic {
|
class java_lang_Class : AllStatic {
|
||||||
friend class VMStructs;
|
friend class VMStructs;
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024, 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 8337622
|
||||||
|
* @summary (reflect) java.lang.Class componentType field not found.
|
||||||
|
* @library /test/lib
|
||||||
|
* @modules java.base/java.lang:open
|
||||||
|
* @run main ComponentTypeFieldTest
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import static jdk.test.lib.Asserts.*;
|
||||||
|
|
||||||
|
public class ComponentTypeFieldTest {
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
Field f = Class.class.getDeclaredField("componentType");
|
||||||
|
f.setAccessible(true);
|
||||||
|
Object val = f.get(Runnable.class);
|
||||||
|
assertTrue(val == null);
|
||||||
|
System.out.println("val is " + val);
|
||||||
|
|
||||||
|
Object arrayVal = f.get(Integer[].class);
|
||||||
|
System.out.println("val is " + arrayVal);
|
||||||
|
String arrayValString = arrayVal.toString();
|
||||||
|
assertTrue(arrayValString.equals("class java.lang.Integer"));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue