ART: Mterp - remove redundant null check

Noted in cl 196153, but failed to fix.

Change-Id: Ib19ce3832eeffa7188b592d62c66df801f27f07c

diff --git a/runtime/interpreter/mterp/arm/op_iget_object_quick.S b/runtime/interpreter/mterp/arm/op_iget_object_quick.S
index fe29106..16cb118 100644 (file)
--- a/runtime/interpreter/mterp/arm/op_iget_object_quick.S
+++ b/runtime/interpreter/mterp/arm/op_iget_object_quick.S
@@ -2,9 +2,8 @@
     /* op vA, vB, offset@CCCC */
     mov     r2, rINST, lsr #12          @ r2<- B
     FETCH r1, 1                         @ r1<- field byte offset
+    EXPORT_PC
     GET_VREG r0, r2                     @ r0<- object we're operating on
-    cmp     r0, #0                      @ check object for null
-    beq     common_errNullObject        @ object was null
     bl      artIGetObjectFromMterp      @ (obj, offset)
     ldr     r3, [rSELF, #THREAD_EXCEPTION_OFFSET]
     ubfx    r2, rINST, #8, #4           @ r2<- A

diff --git a/runtime/interpreter/mterp/out/mterp_arm.S b/runtime/interpreter/mterp/out/mterp_arm.S
index 2d6f057..9ae98a2 100644 (file)
--- a/runtime/interpreter/mterp/out/mterp_arm.S
+++ b/runtime/interpreter/mterp/out/mterp_arm.S
@@ -7147,9 +7147,8 @@ constvalop_long_to_double:
     /* op vA, vB, offset@CCCC */
     mov     r2, rINST, lsr #12          @ r2<- B
     FETCH r1, 1                         @ r1<- field byte offset
+    EXPORT_PC
     GET_VREG r0, r2                     @ r0<- object we're operating on
-    cmp     r0, #0                      @ check object for null
-    beq     common_errNullObject        @ object was null
     bl      artIGetObjectFromMterp      @ (obj, offset)
     ldr     r3, [rSELF, #THREAD_EXCEPTION_OFFSET]
     ubfx    r2, rINST, #8, #4           @ r2<- A