commit 2e61a57988a9172d446a1638bbd61d94c86ed4d9
author Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> Mon Oct 23 08:58:15 2017 +0200
committer Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> Mon Oct 23 08:58:15 2017 +0200
tree d39b3405dcfadeb19e2c8cf64c082e2b9a693013
parent 59c5dfe792d3288c5df75a035f6614cb228d7352

MIPS32: Do implicit null check properly

This fixes 122-npe test failure in debuggable mode for MIPS32.

Test: ./testrunner.py --target --optimizing --debuggable --ndebuggable on CI20
Change-Id: I7c5c1e72a92f29e750265b612079ab0bac2a1dc0

compiler/optimizing/code_generator_mips.cc

diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc
index 893692a..3ba107a 100644
--- a/compiler/optimizing/code_generator_mips.cc
+++ b/compiler/optimizing/code_generator_mips.cc
@@ -6244,8 +6244,11 @@
     InvokeRuntimeCallingConvention calling_convention;
     __ Addiu32(locations->GetTemp(0).AsRegister<Register>(), obj, offset);
     // Do implicit Null check
-    __ Lw(ZERO, locations->GetTemp(0).AsRegister<Register>(), 0);
-    codegen_->RecordPcInfo(instruction, instruction->GetDexPc());
+    __ LoadFromOffset(kLoadWord,
+                      ZERO,
+                      locations->GetTemp(0).AsRegister<Register>(),
+                      0,
+                      null_checker);
     codegen_->InvokeRuntime(kQuickA64Load, instruction, dex_pc);
     CheckEntrypointTypes<kQuickA64Load, int64_t, volatile const int64_t*>();
     if (type == DataType::Type::kFloat64) {
@@ -6398,8 +6401,11 @@
     InvokeRuntimeCallingConvention calling_convention;
     __ Addiu32(locations->GetTemp(0).AsRegister<Register>(), obj, offset);
     // Do implicit Null check.
-    __ Lw(ZERO, locations->GetTemp(0).AsRegister<Register>(), 0);
-    codegen_->RecordPcInfo(instruction, instruction->GetDexPc());
+    __ LoadFromOffset(kLoadWord,
+                      ZERO,
+                      locations->GetTemp(0).AsRegister<Register>(),
+                      0,
+                      null_checker);
     if (type == DataType::Type::kFloat64) {
       // Pass FP parameters in core registers.
       if (value_location.IsFpuRegister()) {