commit 2e8bf554574516e0e6a9b10ccd9f13bf56189795
author Douglas Leung <douglas.leung@imgtec.com> Tue Jul 07 17:27:34 2015 -0700
committer Douglas Leung <douglas.leung@imgtec.com> Tue Jul 07 17:30:17 2015 -0700
tree 4adb597b08b4d3bde1bad230ab8bab5fa866c4b6
parent a100332ee0f4b842c28ec2448f97e40a882cd837

Initialize pDeoptimize quick entry pointer for Mips.

This fixes art test 449-checker-bce.

Change-Id: I9a87c430168ea35984289b0b4a417aa0c659b6d5

runtime/arch/mips/entrypoints_init_mips.cc

diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc
index ff04106..09a018e 100644
--- a/runtime/arch/mips/entrypoints_init_mips.cc
+++ b/runtime/arch/mips/entrypoints_init_mips.cc
@@ -267,6 +267,10 @@
   qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow;
   static_assert(!IsDirectEntrypoint(kQuickThrowStackOverflow), "Non-direct C stub marked direct.");
 
+  // Deoptimize
+  qpoints->pDeoptimize = art_quick_deoptimize;
+  static_assert(!IsDirectEntrypoint(kQuickDeoptimize), "Non-direct C stub marked direct.");
+
   // Atomic 64-bit load/store
   qpoints->pA64Load = QuasiAtomic::Read64;
   static_assert(IsDirectEntrypoint(kQuickA64Load), "Non-direct C stub marked direct.");

runtime/arch/mips64/entrypoints_init_mips64.cc

diff --git a/runtime/arch/mips64/entrypoints_init_mips64.cc b/runtime/arch/mips64/entrypoints_init_mips64.cc
index 321c27b..4904af9 100644
--- a/runtime/arch/mips64/entrypoints_init_mips64.cc
+++ b/runtime/arch/mips64/entrypoints_init_mips64.cc
@@ -176,6 +176,9 @@
   qpoints->pThrowNullPointer = art_quick_throw_null_pointer_exception;
   qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow;
 
+  // Deoptimize
+  qpoints->pDeoptimize = art_quick_deoptimize;
+
   // TODO - use lld/scd instructions for Mips64
   // Atomic 64-bit load/store
   qpoints->pA64Load = QuasiAtomic::Read64;