commit 869042581c78cdee6adb7d702c672b8a1d15ee16
author Mathieu Chartier <mathieuc@google.com> Tue Dec 03 14:17:06 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 03 14:17:06 2013 -0800
tree 9559b734fff58474da26f4f2eee82022ef2946d3
parent 3fc1156f88a7422bbf22f09428b1300df97b77cf
parent 0f6615fe052a499ff7d6e6583a2f66aeb6146f1e

am 0f6615fe: Merge "Fix incorrect IsHeapAddress in jni entrypoints."

* commit '0f6615fe052a499ff7d6e6583a2f66aeb6146f1e':
  Fix incorrect IsHeapAddress in jni entrypoints.

runtime/entrypoints/jni/jni_entrypoints.cc

diff --git a/runtime/entrypoints/jni/jni_entrypoints.cc b/runtime/entrypoints/jni/jni_entrypoints.cc
index 16364fc..4d1e531 100644
--- a/runtime/entrypoints/jni/jni_entrypoints.cc
+++ b/runtime/entrypoints/jni/jni_entrypoints.cc
@@ -50,7 +50,7 @@
   intptr_t value = *arg_ptr;
   mirror::Object** value_as_jni_rep = reinterpret_cast<mirror::Object**>(value);
   mirror::Object* value_as_work_around_rep = value_as_jni_rep != NULL ? *value_as_jni_rep : NULL;
-  CHECK(Runtime::Current()->GetHeap()->IsHeapAddress(value_as_work_around_rep))
+  CHECK(Runtime::Current()->GetHeap()->IsValidObjectAddress(value_as_work_around_rep))
       << value_as_work_around_rep;
   *arg_ptr = reinterpret_cast<intptr_t>(value_as_work_around_rep);
 }