From 1407ee7df9d063e4d94c488c7beb46cb2da0677e Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 8 Jan 2016 15:56:19 +0000 Subject: Add a missing implicit null check in the ARM codegen. The code generated for object ArraySet on ARM used to miss an implicit null check for the array when the assigned value is `null`. This has not been an actual issue so far, as ArraySet instructions have never been using implicit null checks. Note: This CL comes without a regression test, as the code path in question is not used (yet). Change-Id: If3bc85e32802595e635513dfb83ccfcfd8f00d3d --- compiler/optimizing/code_generator_arm.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 4b9f820bb9..3c6cfe438e 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -4683,6 +4683,7 @@ void InstructionCodeGeneratorARM::VisitArraySet(HArraySet* instruction) { __ add(IP, array, ShifterOperand(index.AsRegister(), LSL, TIMES_4)); __ StoreToOffset(kStoreWord, source, IP, data_offset); } + codegen_->MaybeRecordImplicitNullCheck(instruction); DCHECK(!needs_write_barrier); DCHECK(!may_need_runtime_call_for_type_check); break; -- cgit v1.2.3-59-g8ed1b