Fix ifacmpeq/ne null handling

Author: dlunch

jvm_rust/src/interpreter.rs

@@ -453,18 +453,18 @@ impl Interpreter {
                 stack_frame.operand_stack.push(JavaValue::Int(value1 / value2));
             }
             Opcode::IfAcmpeq(x) => {
-                let value2: Box<dyn ClassInstance> = stack_frame.operand_stack.pop().unwrap().into();
-                let value1: Box<dyn ClassInstance> = stack_frame.operand_stack.pop().unwrap().into();
+                let value2: Option<Box<dyn ClassInstance>> = stack_frame.operand_stack.pop().unwrap().into();
+                let value1: Option<Box<dyn ClassInstance>> = stack_frame.operand_stack.pop().unwrap().into();
 
-                if value1.equals(&*value2)? {
+                if value1 == value2 {
                     return Ok(ExecuteNext::Jump((current_offset as i32 + *x as i32) as u32));
                 }
             }
             Opcode::IfAcmpne(x) => {
-                let value2: Box<dyn ClassInstance> = stack_frame.operand_stack.pop().unwrap().into();
-                let value1: Box<dyn ClassInstance> = stack_frame.operand_stack.pop().unwrap().into();
+                let value2: Option<Box<dyn ClassInstance>> = stack_frame.operand_stack.pop().unwrap().into();
+                let value1: Option<Box<dyn ClassInstance>> = stack_frame.operand_stack.pop().unwrap().into();
 
-                if !value1.equals(&*value2)? {
+                if value1 != value2 {
                     return Ok(ExecuteNext::Jump((current_offset as i32 + *x as i32) as u32));
                 }
             }

test_data/ReferenceCompare.class

@@ -0,0 +1,5 @@
+a != b
+a != c
+b != c
+a != d
+a == e

test_data/ReferenceCompare.txt

@@ -0,0 +1,39 @@
+class ReferenceCompare {
+    public static void main(String[] args) {
+        ReferenceCompare a = new ReferenceCompare();
+        ReferenceCompare b = new ReferenceCompare();
+        ReferenceCompare c = null;
+        String d = "test";
+        ReferenceCompare e = a;
+
+        if (a == b) {
+            System.out.println("a == b");
+        } else {
+            System.out.println("a != b");
+        }
+
+        if (a == c) {
+            System.out.println("a == c");
+        } else {
+            System.out.println("a != c");
+        }
+
+        if (b == c) {
+            System.out.println("b == c");
+        } else {
+            System.out.println("b != c");
+        }
+
+        if ((Object) a == d) {
+            System.out.println("a == d");
+        } else {
+            System.out.println("a != d");
+        }
+
+        if (a == e) {
+            System.out.println("a == e");
+        } else {
+            System.out.println("a != e");
+        }
+    }
+}