commit 67d920071fe4a0aa8b8bc339e93b18276238c320
author Elliott Hughes <enh@google.com> Mon Mar 26 15:08:51 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Mar 26 15:08:51 2012 -0700
tree a665c6bdeecf149fc976b992c71543642b44e464
parent 16da17c8d39a813f1b880f576fd2f8bc98ac4a9d

Add a compile-time constant bool equivalent to !defined(NDEBUG).

This makes some code slightly less awkward.

Change-Id: Iafd359dd0baa65510ed9510a7d93ee01605f51e4

src/object.h

diff --git a/src/object.h b/src/object.h
index 4e3e850..cfea1c9 100644
--- a/src/object.h
+++ b/src/object.h
@@ -2333,8 +2333,10 @@
   return GetField32(OFFSET_OF_OBJECT_MEMBER(Method, method_dex_index_), false);
 }
 
-#if !defined(NDEBUG)
 inline void Method::AssertPcIsWithinCode(uintptr_t pc) const {
+  if (!kIsDebugBuild) {
+    return;
+  }
   if (IsNative() || IsRuntimeMethod() || IsProxyMethod()) {
     return;
   }
@@ -2348,9 +2350,6 @@
       << " code=" << GetCode()
       << " size=" << GetCodeSize();
 }
-#else
-inline void Method::AssertPcIsWithinCode(uintptr_t) const {}
-#endif
 
 inline String* Class::GetName() const {
   return GetFieldObject<String*>(OFFSET_OF_OBJECT_MEMBER(Class, name_), false);