Merge pull request #425 from theseus-rs/fix-invokes

fix: use thread execute for internal vm calls

Author: brianheineman

ristretto_vm/src/intrinsic_methods/java/lang/system.rs

@@ -271,15 +271,13 @@ pub(crate) async fn register_natives(
     thread: Arc<Thread>,
     _parameters: Parameters,
 ) -> Result<Option<Value>> {
+    let system_class = thread.class("java.lang.System").await?;
     let vm = thread.vm()?;
     if vm.java_major_version() <= JAVA_8.java() {
-        vm.invoke(
-            "java.lang.System",
-            "setJavaLangAccess",
-            "()V",
-            &[] as &[Value],
-        )
-        .await?;
+        let method = system_class.try_get_method("setJavaLangAccess", "()V")?;
+        thread
+            .execute(&system_class, &method, &[] as &[Value])
+            .await?;
         return Ok(None);
     }
 
@@ -296,13 +294,10 @@ pub(crate) async fn register_natives(
         //             System::getProperties()
         //
         // will eventually call System::getProperty() which fails if this is not initialized.
-        vm.invoke(
-            "java.lang.System",
-            "setProperties",
-            "(Ljava/util/Properties;)V",
-            &[Value::Object(None)],
-        )
-        .await?;
+        let method = system_class.try_get_method("setProperties", "(Ljava/util/Properties;)V")?;
+        thread
+            .execute(&system_class, &method, &[Value::Object(None)])
+            .await?;
     }
 
     let java_major_version = vm.java_major_version();
@@ -316,13 +311,16 @@ pub(crate) async fn register_natives(
     let java_lang_ref_access = java_lang_ref_access_class(&thread, package_name).await?;
     let java_lang_ref_access =
         Value::Object(Some(Reference::Object(Object::new(java_lang_ref_access)?)));
-    vm.invoke(
-        format!("{package_name}/SharedSecrets"),
+    let shared_secrets_class = thread
+        .class(format!("{package_name}/SharedSecrets"))
+        .await?;
+    let method = shared_secrets_class.try_get_method(
         "setJavaLangRefAccess",
         format!("(L{package_name}/JavaLangRefAccess;)V"),
-        &[java_lang_ref_access],
-    )
-    .await?;
+    )?;
+    thread
+        .execute(&shared_secrets_class, &method, &[java_lang_ref_access])
+        .await?;
 
     Ok(None)
 }

ristretto_vm/src/intrinsic_methods/jdk/internal/reflect/constantpool.rs

@@ -116,13 +116,14 @@ pub(crate) async fn get_field_at_0(
         constant_pool.try_get_name_and_type(*name_and_type_index)?;
     let field_name = constant_pool.try_get_utf8(*name_index)?;
     let field_name = field_name.to_object(&vm).await?;
-    let field = vm
-        .invoke(
-            "java.lang.Class",
-            "getDeclaredField",
-            "(Ljava/lang/String;)Ljava/lang/reflect/Field;",
-            &[class_object, field_name],
-        )
+
+    let class = thread.class("java.lang.Class").await?;
+    let method = class.try_get_method(
+        "getDeclaredField",
+        "(Ljava/lang/String;)Ljava/lang/reflect/Field;",
+    )?;
+    let field = thread
+        .execute(&class, &method, &[class_object, field_name])
         .await?;
     Ok(field)
 }
@@ -268,25 +269,29 @@ pub(crate) async fn get_method_at_0(
         parameters_classes.push(parameter_type);
     }
     let class = thread.class("java/lang/Class").await?;
-    let class_parameters = Value::try_from((class, parameters_classes))?;
+    let class_parameters = Value::try_from((class.clone(), parameters_classes))?;
 
     let method = if method_name == "<init>" {
-        vm.invoke(
-            "java.lang.Class",
+        let method = class.try_get_method(
             "getDeclaredConstructor",
             "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;",
-            &[class_object, class_parameters],
-        )
-        .await?
+        )?;
+        thread
+            .execute(&class, &method, &[class_object, class_parameters])
+            .await?
     } else {
         let method_name = method_name.to_object(&vm).await?;
-        vm.invoke(
-            "java.lang.Class",
+        let method = class.try_get_method(
             "getDeclaredMethod",
             "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;",
-            &[class_object, method_name, class_parameters],
-        )
-        .await?
+        )?;
+        thread
+            .execute(
+                &class,
+                &method,
+                &[class_object, method_name, class_parameters],
+            )
+            .await?
     };
 
     Ok(method)
@@ -449,15 +454,12 @@ pub(crate) async fn get_tag_at_0(
     let class = class::get_class(&thread, &object).await?;
     let constant_pool = class.constant_pool();
     let constant = constant_pool.try_get(index)?;
-    let vm = thread.vm()?;
-    let tag = vm
-        .invoke(
-            "jdk.internal.reflect.ConstantPool$Tag",
-            "valueOf",
-            "(B)Ljdk/internal/reflect/ConstantPool$Tag;",
-            &[constant.tag()],
-        )
+
+    let class = thread
+        .class("jdk/internal/reflect/ConstantPool$Tag")
         .await?;
+    let method = class.try_get_method("valueOf", "(B)Ljdk/internal/reflect/ConstantPool$Tag;")?;
+    let tag = thread.execute(&class, &method, &[constant.tag()]).await?;
     Ok(tag)
 }