runtime: update jdk.internal.reflect.ConstantPool

ConstantPool#constantPoolOop is now an injected field in OpenJDK.

Author: Serial-ATA

runtime/src/classes/jdk/internal/reflect/ConstantPool.rs

@@ -44,8 +44,6 @@ crate::classes::field_module! {
 	@CLASS jdk_internal_reflect_ConstantPool;
 
 	@FIELDSTART
-	/// `jdk.internal.reflect.ConstantPool#constantPoolOop` field offset
-	///
-	/// Expected type: `Reference`
-	@FIELD constantPoolOop: ty @ FieldType::Object(_) if ty.is_class(b"java/lang/Object"),
+	/// Injected mirror for the target class
+	@INJECTED constantPoolOop: FieldType::Object((*b"java/lang/Object").into()) => jni::sys::jobject,
 }

runtime/src/classes/mod.rs

@@ -62,7 +62,7 @@ macro_rules! instance_field_count {
 	(
 		$(#[$meta:meta])*
 		$([sym: $specified_sym_name:ident])?
-		@INJECTED $field_name:ident: $_descriptor:pat => $field_ty:ty, $($rest:tt)*
+		@INJECTED $field_name:ident: $_descriptor:expr => $field_ty:ty, $($rest:tt)*
 	) => {
 		0 + crate::classes::instance_field_count!($($rest)*)
 	};

runtime/src/initialization.rs

@@ -299,6 +299,11 @@ fn init_field_offsets() {
 		unsafe {
 			classes::java::lang::reflect::Constructor::init_offsets();
 		}
+
+		// java.lang.reflect.Constructor
+		unsafe {
+			classes::jdk::internal::reflect::ConstantPool::init_offsets();
+		}
 	}
 }
 

runtime/src/objects/class/mod.rs

@@ -699,6 +699,8 @@ impl Class {
 			old_fields.assume_init()
 		};
 
+		let has_instance_fields = old_fields.len() > 0;
+
 		let max_instance_index = old_fields
 			.iter()
 			.fold(0, |a, b| if b.is_static() { a } else { a.max(b.index()) });
@@ -711,10 +713,19 @@ impl Class {
 		let mut new_fields = Vec::with_capacity(expected_len);
 		new_fields.extend(old_fields);
 
+		let injected_field_start_index;
+		if has_instance_fields {
+			// + 1 as `max_instance_index` is the index of the *last* instance field, not of the first
+			// field we inject.
+			injected_field_start_index = max_instance_index + 1;
+		} else {
+			injected_field_start_index = 0;
+		}
+
 		for (idx, field) in fields.into_iter().enumerate() {
 			assert!(!field.is_static());
 			unsafe {
-				field.set_index(max_instance_index + idx + 1);
+				field.set_index(injected_field_start_index + idx);
 				field.set_offset(offset);
 			}
 			offset = field.offset() + field.descriptor.size();
@@ -729,10 +740,8 @@ impl Class {
 			std::ptr::write(old_fields_ptr, new_fields);
 		}
 
-		// + 1 as `max_instance_index` is the index of the *last* instance field, not of the first
-		// field we inject.
 		self.field_container
-			.set_instance_field_count((max_instance_index + 1 + field_count) as u32);
+			.set_instance_field_count((injected_field_start_index + field_count) as u32);
 	}
 
 	/// Set the nest host for this class