Store java.lang.Class name as byte array and resolve ClassDefinition on demand

Author: dlunch

java_runtime/src/classes/java/lang/class.rs

@@ -42,7 +42,7 @@ impl Class {
                 ),
             ],
             fields: vec![
-                JavaFieldProto::new("raw", "[B", Default::default()), // raw rust pointer of Box<dyn Class>
+                JavaFieldProto::new("nameBytes", "[B", Default::default()),
                 JavaFieldProto::new("classLoader", "Ljava/lang/ClassLoader;", Default::default()),
             ],
             access_flags: Default::default(),

jvm/src/runtime/java_lang_class.rs

@@ -1,15 +1,21 @@
 use alloc::boxed::Box;
 
-use crate::{Result, class_definition::ClassDefinition, class_instance::ClassInstance, jvm::Jvm};
+use crate::{Array, ClassInstanceRef, Result, class_definition::ClassDefinition, class_instance::ClassInstance, jvm::Jvm};
 
 pub struct JavaLangClass;
 
 impl JavaLangClass {
     #[allow(clippy::borrowed_box)]
     pub async fn to_rust_class(jvm: &Jvm, this: &Box<dyn ClassInstance>) -> Result<Box<dyn ClassDefinition>> {
-        let rust_class = jvm.get_rust_object_field(this, "raw").await?;
-
-        Ok(rust_class)
+        let name_bytes: ClassInstanceRef<Array<i8>> = jvm.get_field(this, "nameBytes", "[B").await?;
+        let len = jvm.array_length(&name_bytes).await?;
+        let name_bytes_vec: alloc::vec::Vec<i8> = jvm.load_array(&name_bytes, 0, len).await?;
+        let class_name = alloc::string::String::from_utf8(name_bytes_vec.iter().map(|&b| b as u8).collect()).unwrap_or_default();
+        if let Some(class) = jvm.get_class(&class_name) {
+            Ok(class.definition)
+        } else {
+            Err(jvm.exception("java/lang/NoClassDefFoundError", &class_name).await)
+        }
     }
 
     pub async fn from_rust_class(
@@ -19,7 +25,12 @@ impl JavaLangClass {
     ) -> Result<Box<dyn ClassInstance>> {
         let mut java_class = jvm.new_class("java/lang/Class", "()V", ()).await?;
 
-        jvm.put_rust_object_field(&mut java_class, "raw", rust_class).await?;
+        let class_name = rust_class.name();
+        let mut name_bytes = jvm.instantiate_array("B", class_name.len()).await?;
+        let bytes: alloc::vec::Vec<i8> = class_name.as_bytes().iter().map(|&b| b as i8).collect();
+        jvm.store_array(&mut name_bytes, 0, bytes).await?;
+        jvm.put_field(&mut java_class, "nameBytes", "[B", name_bytes).await?;
+
         jvm.put_field(&mut java_class, "classLoader", "Ljava/lang/ClassLoader;", class_loader)
             .await?;