Fix reference to non-existent function in debug code.

The generated interpreter code has some debugging code
that call dvmIsHeapAddressObject, which doesn't exist.
This causes the build to fails when we build Dalvik with
DEBUG_DALVIK_VM=true.  Use dvmIsHeapAddress instead.

Change-Id: Ifc5eeb4bd2ea6b45046c606b744b1a70a5e56dfc

diff --git a/vm/mterp/c/header.cpp b/vm/mterp/c/header.cpp
index c7bd4a0..44d7064 100644 (file)
--- a/vm/mterp/c/header.cpp
+++ b/vm/mterp/c/header.cpp
@@ -313,7 +313,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-allstubs.cpp b/vm/mterp/out/InterpC-allstubs.cpp
index a8d33cc..da10b52 100644 (file)
--- a/vm/mterp/out/InterpC-allstubs.cpp
+++ b/vm/mterp/out/InterpC-allstubs.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-armv5te-vfp.cpp b/vm/mterp/out/InterpC-armv5te-vfp.cpp
index f26b624..7330366 100644 (file)
--- a/vm/mterp/out/InterpC-armv5te-vfp.cpp
+++ b/vm/mterp/out/InterpC-armv5te-vfp.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-armv5te.cpp b/vm/mterp/out/InterpC-armv5te.cpp
index 07f016b..007ff8e 100644 (file)
--- a/vm/mterp/out/InterpC-armv5te.cpp
+++ b/vm/mterp/out/InterpC-armv5te.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-armv7-a-neon.cpp b/vm/mterp/out/InterpC-armv7-a-neon.cpp
index 8316a5c..79104e8 100644 (file)
--- a/vm/mterp/out/InterpC-armv7-a-neon.cpp
+++ b/vm/mterp/out/InterpC-armv7-a-neon.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-armv7-a.cpp b/vm/mterp/out/InterpC-armv7-a.cpp
index 93184bb..3bd0bc0 100644 (file)
--- a/vm/mterp/out/InterpC-armv7-a.cpp
+++ b/vm/mterp/out/InterpC-armv7-a.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-portable.cpp b/vm/mterp/out/InterpC-portable.cpp
index 4cb526a..46c8598 100644 (file)
--- a/vm/mterp/out/InterpC-portable.cpp
+++ b/vm/mterp/out/InterpC-portable.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-x86-atom.cpp b/vm/mterp/out/InterpC-x86-atom.cpp
index bc23ab6..6360c06 100644 (file)
--- a/vm/mterp/out/InterpC-x86-atom.cpp
+++ b/vm/mterp/out/InterpC-x86-atom.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }

diff --git a/vm/mterp/out/InterpC-x86.cpp b/vm/mterp/out/InterpC-x86.cpp
index 2377ae2..a4931c0 100644 (file)
--- a/vm/mterp/out/InterpC-x86.cpp
+++ b/vm/mterp/out/InterpC-x86.cpp
@@ -320,7 +320,7 @@ static inline bool checkForNull(Object* obj)
         return false;
     }
 #ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsHeapAddressObject(obj)) {
+    if (!dvmIsHeapAddress(obj)) {
         LOGE("Invalid object %p", obj);
         dvmAbort();
     }