From 8a1fac7c796148a5eaf5156d20958512ff70a99e Mon Sep 17 00:00:00 2001
From: brianheineman <brian.heineman@gmail.com>
Date: Wed, 30 Oct 2024 13:16:39 -0600
Subject: [PATCH 1/2] fix: create array class for anewarray instruction

---
 ristretto_vm/src/instruction/array.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ristretto_vm/src/instruction/array.rs b/ristretto_vm/src/instruction/array.rs
index 4433c46b..aae23f4b 100644
--- a/ristretto_vm/src/instruction/array.rs
+++ b/ristretto_vm/src/instruction/array.rs
@@ -34,7 +34,8 @@ pub(crate) async fn anewarray(frame: &Frame, index: u16) -> Result<ExecutionResu
     let vm = thread.vm()?;
     let constant_pool = frame.class().constant_pool();
     let class_name = constant_pool.try_get_class(index)?;
-    let class = vm.load_class(&thread, class_name).await?;
+    let array_class_name = format!("[L{class_name};");
+    let class = vm.load_class(&thread, array_class_name.as_str()).await?;
     let stack = frame.stack();
     let count = stack.pop_int()?;
     let count = usize::try_from(count)?;
@@ -270,11 +271,13 @@ mod tests {
         let result = anewarray(&frame, class_index).await?;
         assert_eq!(Continue, result);
         let stack = frame.stack();
-        let object = stack.pop()?;
-        assert!(matches!(
-            object,
-            Value::Object(Some(Reference::Array(_, _)))
-        ));
+        let Value::Object(Some(reference)) = stack.pop()? else {
+            panic!("expected object");
+        };
+        let class = reference.class()?;
+        assert_eq!("[Ljava/lang/Object;", class.name());
+        assert_eq!("java/lang/Object", class.array_component_type());
+        assert!(class.is_array());
         Ok(())
     }
 

From cdcacc50ca6fe7127519cde0f0a8446647d8fc37 Mon Sep 17 00:00:00 2001
From: brianheineman <brian.heineman@gmail.com>
Date: Wed, 30 Oct 2024 13:18:14 -0600
Subject: [PATCH 2/2] chore: update panic message

---
 ristretto_vm/src/instruction/array.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ristretto_vm/src/instruction/array.rs b/ristretto_vm/src/instruction/array.rs
index aae23f4b..c38fd583 100644
--- a/ristretto_vm/src/instruction/array.rs
+++ b/ristretto_vm/src/instruction/array.rs
@@ -272,7 +272,7 @@ mod tests {
         assert_eq!(Continue, result);
         let stack = frame.stack();
         let Value::Object(Some(reference)) = stack.pop()? else {
-            panic!("expected object");
+            panic!("expected reference");
         };
         let class = reference.class()?;
         assert_eq!("[Ljava/lang/Object;", class.name());