diff options
Diffstat (limited to 'compiler/dex')
| -rw-r--r-- | compiler/dex/quick/arm/int_arm.cc | 4 | ||||
| -rw-r--r-- | compiler/dex/quick/arm64/int_arm64.cc | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index 8e08f5fb9d..ce31b278a8 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -1351,7 +1351,6 @@ void ArmMir2Lir::GenArrayGet(int opt_flags, OpSize size, RegLocation rl_array, FreeTemp(reg_len); } LoadBaseDisp(reg_ptr, data_offset, rl_result.reg, size, kNotVolatile); - MarkPossibleNullPointerException(opt_flags); if (!constant_index) { FreeTemp(reg_ptr); } @@ -1372,7 +1371,6 @@ void ArmMir2Lir::GenArrayGet(int opt_flags, OpSize size, RegLocation rl_array, FreeTemp(reg_len); } LoadBaseIndexed(reg_ptr, rl_index.reg, rl_result.reg, scale, size); - MarkPossibleNullPointerException(opt_flags); FreeTemp(reg_ptr); StoreValue(rl_dest, rl_result); } @@ -1451,7 +1449,6 @@ void ArmMir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, } StoreBaseDisp(reg_ptr, data_offset, rl_src.reg, size, kNotVolatile); - MarkPossibleNullPointerException(opt_flags); } else { /* reg_ptr -> array data */ OpRegRegImm(kOpAdd, reg_ptr, rl_array.reg, data_offset); @@ -1461,7 +1458,6 @@ void ArmMir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, FreeTemp(reg_len); } StoreBaseIndexed(reg_ptr, rl_index.reg, rl_src.reg, scale, size); - MarkPossibleNullPointerException(opt_flags); } if (allocated_reg_ptr_temp) { FreeTemp(reg_ptr); diff --git a/compiler/dex/quick/arm64/int_arm64.cc b/compiler/dex/quick/arm64/int_arm64.cc index 6e7241dcd6..418d81efe6 100644 --- a/compiler/dex/quick/arm64/int_arm64.cc +++ b/compiler/dex/quick/arm64/int_arm64.cc @@ -1181,7 +1181,6 @@ void Arm64Mir2Lir::GenArrayGet(int opt_flags, OpSize size, RegLocation rl_array, } else { LoadBaseDisp(reg_ptr, data_offset, rl_result.reg, size, kNotVolatile); } - MarkPossibleNullPointerException(opt_flags); if (!constant_index) { FreeTemp(reg_ptr); } @@ -1206,7 +1205,6 @@ void Arm64Mir2Lir::GenArrayGet(int opt_flags, OpSize size, RegLocation rl_array, } else { LoadBaseIndexed(reg_ptr, As64BitReg(rl_index.reg), rl_result.reg, scale, size); } - MarkPossibleNullPointerException(opt_flags); FreeTemp(reg_ptr); StoreValue(rl_dest, rl_result); } @@ -1289,7 +1287,6 @@ void Arm64Mir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, } else { StoreBaseDisp(reg_ptr, data_offset, rl_src.reg, size, kNotVolatile); } - MarkPossibleNullPointerException(opt_flags); } else { /* reg_ptr -> array data */ OpRegRegImm(kOpAdd, reg_ptr, rl_array.reg, data_offset); @@ -1303,7 +1300,6 @@ void Arm64Mir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, } else { StoreBaseIndexed(reg_ptr, As64BitReg(rl_index.reg), rl_src.reg, scale, size); } - MarkPossibleNullPointerException(opt_flags); } if (allocated_reg_ptr_temp) { FreeTemp(reg_ptr); |