Implement a new command line option, -debug, which is meant to unify all of

the random debugging macros scattered throughout llvm.

The new DEBUG(x) macro should be used instead of special purpose debug macros.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2709 91177308-0d34-0410-b5e6-96231b3b80d8

6 files changed, 72 insertions, 0 deletions

diff --git a/include/Support/Statistic.h b/include/Support/Statistic.h
index 5c464865ed..453af34fe0 100644
--- a/include/Support/Statistic.h
+++ b/include/Support/Statistic.h
@@ -19,6 +19,27 @@
 
 #include <iosfwd>
 
+// DebugFlag - This boolean is set to true if the '-debug' command line option
+// is specified.  This should probably not be referenced directly, instead, use
+// the DEBUG macro below.
+//
+extern bool DebugFlag;
+
+// DEBUG macro - This macro should be used by passes to emit debug information.
+// In the '-debug' option is specified on the commandline, and if this is a
+// debug build, then the code specified as the option to the macro will be
+// executed.  Otherwise it will not be.  Example:
+//
+// DEBUG(cerr << "Bitset contains: " << Bitset << "\n");
+//
+#ifdef NDEBUG
+#define DEBUG(X)
+#else
+#define DEBUG(X) \
+  do { if (DebugFlag) { X; } } while (0)
+#endif
+
+
 // StatisticBase - Nontemplated base class for Statistic<> class...
 class StatisticBase {
   const char *Name;
diff --git a/include/Support/StatisticReporter.h b/include/Support/StatisticReporter.h
index 5c464865ed..453af34fe0 100644
--- a/include/Support/StatisticReporter.h
+++ b/include/Support/StatisticReporter.h
@@ -19,6 +19,27 @@
 
 #include <iosfwd>
 
+// DebugFlag - This boolean is set to true if the '-debug' command line option
+// is specified.  This should probably not be referenced directly, instead, use
+// the DEBUG macro below.
+//
+extern bool DebugFlag;
+
+// DEBUG macro - This macro should be used by passes to emit debug information.
+// In the '-debug' option is specified on the commandline, and if this is a
+// debug build, then the code specified as the option to the macro will be
+// executed.  Otherwise it will not be.  Example:
+//
+// DEBUG(cerr << "Bitset contains: " << Bitset << "\n");
+//
+#ifdef NDEBUG
+#define DEBUG(X)
+#else
+#define DEBUG(X) \
+  do { if (DebugFlag) { X; } } while (0)
+#endif
+
+
 // StatisticBase - Nontemplated base class for Statistic<> class...
 class StatisticBase {
   const char *Name;
diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h
index 5c464865ed..453af34fe0 100644
--- a/include/llvm/ADT/Statistic.h
+++ b/include/llvm/ADT/Statistic.h
@@ -19,6 +19,27 @@
 
 #include <iosfwd>
 
+// DebugFlag - This boolean is set to true if the '-debug' command line option
+// is specified.  This should probably not be referenced directly, instead, use
+// the DEBUG macro below.
+//
+extern bool DebugFlag;
+
+// DEBUG macro - This macro should be used by passes to emit debug information.
+// In the '-debug' option is specified on the commandline, and if this is a
+// debug build, then the code specified as the option to the macro will be
+// executed.  Otherwise it will not be.  Example:
+//
+// DEBUG(cerr << "Bitset contains: " << Bitset << "\n");
+//
+#ifdef NDEBUG
+#define DEBUG(X)
+#else
+#define DEBUG(X) \
+  do { if (DebugFlag) { X; } } while (0)
+#endif
+
+
 // StatisticBase - Nontemplated base class for Statistic<> class...
 class StatisticBase {
   const char *Name;
diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp
index 79b19503b7..249955beeb 100644
--- a/lib/Support/Statistic.cpp
+++ b/lib/Support/Statistic.cpp
@@ -18,7 +18,10 @@
 #include "Support/CommandLine.h"
 #include <iostream>
 
+bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
+
 static cl::Flag Enabled("stats", "Enable statistics output from program");
+static cl::Flag Debug(DebugFlag, "debug", "Enable debug output", cl::Hidden);
 
 // Print information when destroyed, iff command line option is specified
 void StatisticBase::destroy() const {
diff --git a/support/lib/Support/Statistic.cpp b/support/lib/Support/Statistic.cpp
index 79b19503b7..249955beeb 100644
--- a/support/lib/Support/Statistic.cpp
+++ b/support/lib/Support/Statistic.cpp
@@ -18,7 +18,10 @@
 #include "Support/CommandLine.h"
 #include <iostream>
 
+bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
+
 static cl::Flag Enabled("stats", "Enable statistics output from program");
+static cl::Flag Debug(DebugFlag, "debug", "Enable debug output", cl::Hidden);
 
 // Print information when destroyed, iff command line option is specified
 void StatisticBase::destroy() const {
diff --git a/support/lib/Support/StatisticReporter.cpp b/support/lib/Support/StatisticReporter.cpp
index 79b19503b7..249955beeb 100644
--- a/support/lib/Support/StatisticReporter.cpp
+++ b/support/lib/Support/StatisticReporter.cpp
@@ -18,7 +18,10 @@
 #include "Support/CommandLine.h"
 #include <iostream>
 
+bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
+
 static cl::Flag Enabled("stats", "Enable statistics output from program");
+static cl::Flag Debug(DebugFlag, "debug", "Enable debug output", cl::Hidden);
 
 // Print information when destroyed, iff command line option is specified
 void StatisticBase::destroy() const {