diff options
| author | 2016-01-15 01:09:35 +0000 | |
|---|---|---|
| committer | 2016-01-15 01:09:35 +0000 | |
| commit | 68c56ae9ccdb6e348501456e374ae65e74f6270c (patch) | |
| tree | 7b304ecdcfedc209a69a218262d69bf6d345438a | |
| parent | c753c96360dc68e10fe42aa240fdacca49469070 (diff) | |
| parent | bb6e7269b7d3cbf375133f531e8f9983d353d28a (diff) | |
Merge "ART: Mterp - remove redundant null check"
| -rw-r--r-- | runtime/interpreter/mterp/arm/op_iget_object_quick.S | 3 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/out/mterp_arm.S | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/runtime/interpreter/mterp/arm/op_iget_object_quick.S b/runtime/interpreter/mterp/arm/op_iget_object_quick.S index fe29106d47..16cb1189ad 100644 --- 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 2d6f057aa7..9ae98a2bbe 100644 --- 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 |