From 34987b48d216786454aca59474cb76015af48bd9 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Wed, 26 Oct 2011 16:25:27 -0700
Subject: [PATCH] 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
---
 vm/mterp/c/header.cpp                 | 2 +-
 vm/mterp/out/InterpC-allstubs.cpp     | 2 +-
 vm/mterp/out/InterpC-armv5te-vfp.cpp  | 2 +-
 vm/mterp/out/InterpC-armv5te.cpp      | 2 +-
 vm/mterp/out/InterpC-armv7-a-neon.cpp | 2 +-
 vm/mterp/out/InterpC-armv7-a.cpp      | 2 +-
 vm/mterp/out/InterpC-portable.cpp     | 2 +-
 vm/mterp/out/InterpC-x86-atom.cpp     | 2 +-
 vm/mterp/out/InterpC-x86.cpp          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vm/mterp/c/header.cpp b/vm/mterp/c/header.cpp
index c7bd4a05b..44d706413 100644
--- 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 a8d33cc62..da10b5232 100644
--- 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 f26b62450..733036637 100644
--- 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 07f016b89..007ff8e8b 100644
--- 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 8316a5caf..79104e8ca 100644
--- 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 93184bb14..3bd0bc06e 100644
--- 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 4cb526a7b..46c8598d9 100644
--- 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 bc23ab667..6360c0640 100644
--- 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 2377ae289..a4931c033 100644
--- 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();
     }
-- 
2.11.0