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/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index d2e8e07..4156bb3 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -280,13 +280,8 @@
   if (class_path_string != NULL) {
     parsed->class_path_string_ = class_path_string;
   }
-#ifdef NDEBUG
-  // -Xcheck:jni is off by default for regular builds...
-  parsed->check_jni_ = false;
-#else
-  // ...but on by default in debug builds.
-  parsed->check_jni_ = true;
-#endif
+  // -Xcheck:jni is off by default for regular builds but on by default in debug builds.
+  parsed->check_jni_ = kIsDebugBuild;
 
   parsed->heap_initial_size_ = Heap::kInitialSize;
   parsed->heap_maximum_size_ = Heap::kMaximumSize;
@@ -435,10 +430,11 @@
     } else if (StartsWith(option, "-Xlockprofthreshold:")) {
       parsed->lock_profiling_threshold_ = ParseIntegerOrDie(option);
     } else if (StartsWith(option, "-Xstacktracefile:")) {
-// always show stack traces in debug builds
-#ifdef NDEBUG
-      parsed->stack_trace_file_ = option.substr(strlen("-Xstacktracefile:"));
-#endif
+      if (kIsDebugBuild) {
+        // Ignore the zygote and always show stack traces in debug builds.
+      } else {
+        parsed->stack_trace_file_ = option.substr(strlen("-Xstacktracefile:"));
+      }
     } else if (option == "sensitiveThread") {
       parsed->hook_is_sensitive_thread_ = reinterpret_cast<bool (*)()>(options[i].second);
     } else if (option == "vfprintf") {
@@ -476,11 +472,7 @@
   }
 
   LOG(INFO) << "Build type: "
-#ifndef NDEBUG
-            << "debug"
-#else
-            << "optimized"
-#endif
+            << (kIsDebugBuild ? "debug" : "optimized")
             << "; CheckJNI: " << (parsed->check_jni_ ? "on" : "off");
 
   return parsed.release();