commit 363910e676f388b87478e553c243157d395ffc3c
author Roland Levillain <rpl@google.com> Fri Jan 08 16:50:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 16:50:53 2016 +0000
tree ea179b1a3db97302f96b0f17b6a2ac05e00118f2
parent fbd9dfcf4ffc32f0bda831aa898c7ea5dbf8ed9a
parent 1407ee7df9d063e4d94c488c7beb46cb2da0677e

Merge "Add a missing implicit null check in the ARM codegen."

compiler/optimizing/code_generator_arm.cc

diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index 299e6a1..b32a81a 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -4683,6 +4683,7 @@
           __ add(IP, array, ShifterOperand(index.AsRegister<Register>(), 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;