Remove unrequired method

Author: dlunch

jvm/src/field.rs

@@ -3,11 +3,10 @@ use core::fmt::Debug;
 
 use java_constants::FieldAccessFlags;
 
-use crate::{as_any::AsAny, r#type::JavaType};
+use crate::as_any::AsAny;
 
 pub trait Field: Sync + Send + AsAny + Debug {
     fn name(&self) -> String;
     fn descriptor(&self) -> String;
-    fn r#type(&self) -> JavaType;
     fn access_flags(&self) -> FieldAccessFlags;
 }

jvm/src/garbage_collector.rs

@@ -5,7 +5,7 @@ use bytemuck::cast_slice;
 use hashbrown::{hash_set::Entry, HashMap, HashSet};
 use parking_lot::Mutex;
 
-use crate::{thread::JvmThread, ClassInstance, JavaType, JavaValue, Jvm};
+use crate::{thread::JvmThread, ClassInstance, JavaValue, Jvm};
 
 // XXX java/util/Vector, java/util/HashMap internal..
 type RustVector = Arc<Mutex<Vec<Box<dyn ClassInstance>>>>;
@@ -59,29 +59,27 @@ fn find_reachable_objects(jvm: &Jvm, object: &Box<dyn ClassInstance>, reachable_
 
     let fields = object.class_definition().fields();
     for field in fields {
-        match field.r#type() {
-            JavaType::Class(_) => {
-                let value = object.get_field(&*field).unwrap();
-                if let JavaValue::Object(Some(value)) = value {
-                    find_reachable_objects(jvm, &value, reachable_objects);
-                }
+        let descriptor = field.descriptor();
+
+        if descriptor.starts_with("L") && descriptor.ends_with(";") {
+            let value = object.get_field(&*field).unwrap();
+            if let JavaValue::Object(Some(value)) = value {
+                find_reachable_objects(jvm, &value, reachable_objects);
             }
-            JavaType::Array(_) => {
-                let value = object.get_field(&*field).unwrap();
-                if let JavaValue::Object(Some(value)) = value {
-                    reachable_objects.insert(value.clone());
-
-                    let array = value.as_array_instance().unwrap();
-                    let values = array.load(0, array.length()).unwrap();
-
-                    for value in values {
-                        if let JavaValue::Object(Some(value)) = value {
-                            find_reachable_objects(jvm, &value, reachable_objects);
-                        }
+        } else if descriptor.starts_with("[") {
+            let value = object.get_field(&*field).unwrap();
+            if let JavaValue::Object(Some(value)) = value {
+                reachable_objects.insert(value.clone());
+
+                let array = value.as_array_instance().unwrap();
+                let values = array.load(0, array.length()).unwrap();
+
+                for value in values {
+                    if let JavaValue::Object(Some(value)) = value {
+                        find_reachable_objects(jvm, &value, reachable_objects);
                     }
                 }
             }
-            _ => {}
         }
     }
 }

jvm_rust/src/class_definition.rs

@@ -15,7 +15,7 @@ use parking_lot::RwLock;
 use classfile::ClassInfo;
 use java_class_proto::JavaClassProto;
 use java_constants::{FieldAccessFlags, MethodAccessFlags};
-use jvm::{ClassDefinition, ClassInstance, Field, JavaValue, Method, Result};
+use jvm::{ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Method, Result};
 
 use crate::{class_instance::ClassInstanceImpl, field::FieldImpl, method::MethodImpl};
 
@@ -124,7 +124,7 @@ impl ClassDefinition for ClassDefinitionImpl {
         if let Some(x) = value {
             Ok(x.clone())
         } else {
-            Ok(field.r#type().default())
+            Ok(JavaType::parse(&field.descriptor()).default())
         }
     }
 

jvm_rust/src/class_instance.rs

@@ -6,7 +6,7 @@ use core::{
 
 use parking_lot::RwLock;
 
-use jvm::{ClassDefinition, ClassInstance, Field, JavaValue, Result};
+use jvm::{ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Result};
 
 use crate::{class_definition::ClassDefinitionImpl, FieldImpl};
 
@@ -58,7 +58,7 @@ impl ClassInstance for ClassInstanceImpl {
         if let Some(x) = value {
             Ok(x.clone())
         } else {
-            Ok(field.r#type().default())
+            Ok(JavaType::parse(&field.descriptor()).default())
         }
     }
 

jvm_rust/src/field.rs

@@ -6,7 +6,7 @@ use alloc::{
 use classfile::FieldInfo;
 use java_class_proto::JavaFieldProto;
 use java_constants::FieldAccessFlags;
-use jvm::{Field, JavaType};
+use jvm::Field;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd)]
 struct FieldInner {
@@ -58,8 +58,4 @@ impl Field for FieldImpl {
     fn access_flags(&self) -> FieldAccessFlags {
         self.inner.access_flags
     }
-
-    fn r#type(&self) -> JavaType {
-        JavaType::parse(&self.inner.descriptor)
-    }
 }