diff options
| -rw-r--r-- | include/llvm/Support/Debug.h | 25 | ||||
| -rw-r--r-- | lib/Support/Debug.cpp | 58 |
2 files changed, 23 insertions, 60 deletions
diff --git a/include/llvm/Support/Debug.h b/include/llvm/Support/Debug.h index 17dca21..fce2500 100644 --- a/include/llvm/Support/Debug.h +++ b/include/llvm/Support/Debug.h @@ -26,8 +26,6 @@ #ifndef LLVM_SUPPORT_DEBUG_H #define LLVM_SUPPORT_DEBUG_H -#include "llvm/Support/Streams.h" - namespace llvm { // DebugFlag - This boolean is set to true if the '-debug' command line option @@ -40,7 +38,11 @@ extern bool DebugFlag; // specified on the command line, or if none was specified on the command line // with the -debug-only=X option. // +#ifndef NDEBUG bool isCurrentDebugType(const char *Type); +#else +#define isCurrentDebugType(X) (false) +#endif // DEBUG_WITH_TYPE macro - This macro should be used by passes to emit debug // information. In the '-debug' option is specified on the commandline, and if @@ -72,24 +74,7 @@ bool isCurrentDebugType(const char *Type); #endif #define DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X) - -/// getNullOutputStream - Return a null string that does not output -/// anything. This hides the static variable from other modules. -/// -OStream &getNullOutputStream(); - -/// getErrorOutputStream - Returns the error output stream (std::cerr). This -/// places the std::c* I/O streams into one .cpp file and relieves the whole -/// program from having to have hundreds of static c'tor/d'tors for them. -/// -OStream &getErrorOutputStream(const char *DebugType); - -#ifdef NDEBUG -#define DOUT llvm::getNullOutputStream() -#else -#define DOUT llvm::getErrorOutputStream(DEBUG_TYPE) -#endif - + } // End llvm namespace #endif diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp index b6beddb..806a655 100644 --- a/lib/Support/Debug.cpp +++ b/lib/Support/Debug.cpp @@ -29,28 +29,26 @@ using namespace llvm; bool llvm::DebugFlag; // DebugFlag - Exported boolean set by the -debug option -namespace { #ifndef NDEBUG - // -debug - Command line option to enable the DEBUG statements in the passes. - // This flag may only be enabled in debug builds. - static cl::opt<bool, true> - Debug("debug", cl::desc("Enable debug output"), cl::Hidden, - cl::location(DebugFlag)); - - static std::string CurrentDebugType; - static struct DebugOnlyOpt { - void operator=(const std::string &Val) const { - DebugFlag |= !Val.empty(); - CurrentDebugType = Val; - } - } DebugOnlyOptLoc; - - static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> > - DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"), - cl::Hidden, cl::value_desc("debug string"), - cl::location(DebugOnlyOptLoc), cl::ValueRequired); +// -debug - Command line option to enable the DEBUG statements in the passes. +// This flag may only be enabled in debug builds. +static cl::opt<bool, true> +Debug("debug", cl::desc("Enable debug output"), cl::Hidden, + cl::location(DebugFlag)); + +static std::string CurrentDebugType; +static struct DebugOnlyOpt { + void operator=(const std::string &Val) const { + DebugFlag |= !Val.empty(); + CurrentDebugType = Val; + } +} DebugOnlyOptLoc; + +static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> > +DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"), + cl::Hidden, cl::value_desc("debug string"), + cl::location(DebugOnlyOptLoc), cl::ValueRequired); #endif -} // isCurrentDebugType - Return true if the specified string is the debug type // specified on the command line, or if none was specified on the command line @@ -63,23 +61,3 @@ bool llvm::isCurrentDebugType(const char *DebugType) { return false; #endif } - -/// getNullOutputStream - Return a null string that does not output -/// anything. This hides the static variable from other modules. -/// -OStream &llvm::getNullOutputStream() { - static llvm::OStream NullStream(0); - return NullStream; -} - -// getErrorOutputStream - Returns the error output stream (std::cerr). This -// places the std::c* I/O streams into one .cpp file and relieves the whole -// program from having to have hundreds of static c'tor/d'tors for them. -// -OStream &llvm::getErrorOutputStream(const char *DebugType) { - static OStream cnoout(0); - if (DebugFlag && isCurrentDebugType(DebugType)) - return cerr; - else - return cnoout; -} |