From: Daniel Dunbar Date: Sun, 23 Aug 2009 08:50:52 +0000 (+0000) Subject: Fix some refactos for iostream changes (in -Asserts mode). X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=43ed267db3512823a9698f810be4e64bee227270;p=oota-llvm.git Fix some refactos for iostream changes (in -Asserts mode). - The world needs better C++ refactoring tools, can I get an Amen!? git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79843 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Support/Debug.h b/include/llvm/Support/Debug.h index fce2500489f..6f82ea716f2 100644 --- a/include/llvm/Support/Debug.h +++ b/include/llvm/Support/Debug.h @@ -32,7 +32,9 @@ namespace llvm { // is specified. This should probably not be referenced directly, instead, use // the DEBUG macro below. // +#ifndef NDEBUG extern bool DebugFlag; +#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 diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 5bf86e3630f..25dfa6e1ba5 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -305,8 +305,8 @@ void MachineFunction::viewCFG() const #ifndef NDEBUG ViewGraph(this, "mf" + getFunction()->getNameStr()); #else - cerr << "SelectionDAG::viewGraph is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::viewGraph is only available in debug builds on " + << "systems with Graphviz or gv!\n"; #endif // NDEBUG } @@ -315,8 +315,8 @@ void MachineFunction::viewCFGOnly() const #ifndef NDEBUG ViewGraph(this, "mf" + getFunction()->getNameStr(), true); #else - cerr << "SelectionDAG::viewGraph is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::viewGraph is only available in debug builds on " + << "systems with Graphviz or gv!\n"; #endif // NDEBUG } diff --git a/lib/CodeGen/ScheduleDAGPrinter.cpp b/lib/CodeGen/ScheduleDAGPrinter.cpp index ae358ec4fb5..95ad05e7d78 100644 --- a/lib/CodeGen/ScheduleDAGPrinter.cpp +++ b/lib/CodeGen/ScheduleDAGPrinter.cpp @@ -93,7 +93,7 @@ void ScheduleDAG::viewGraph() { ViewGraph(this, "dag." + MF.getFunction()->getNameStr(), false, "Scheduling-Units Graph for " + MF.getFunction()->getNameStr()); #else - cerr << "ScheduleDAG::viewGraph is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + errs() << "ScheduleDAG::viewGraph is only available in debug builds on " + << "systems with Graphviz or gv!\n"; #endif // NDEBUG } diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp index 50f2d07f8b2..ccc5e3c75c9 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp @@ -141,8 +141,8 @@ void SelectionDAG::viewGraph(const std::string &Title) { ViewGraph(this, "dag." + getMachineFunction().getFunction()->getNameStr(), false, Title); #else - cerr << "SelectionDAG::viewGraph is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::viewGraph is only available in debug builds on " + << "systems with Graphviz or gv!\n"; #endif // NDEBUG } @@ -158,8 +158,8 @@ void SelectionDAG::clearGraphAttrs() { #ifndef NDEBUG NodeGraphAttrs.clear(); #else - cerr << "SelectionDAG::clearGraphAttrs is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::clearGraphAttrs is only available in debug builds" + << " on systems with Graphviz or gv!\n"; #endif } @@ -170,8 +170,8 @@ void SelectionDAG::setGraphAttrs(const SDNode *N, const char *Attrs) { #ifndef NDEBUG NodeGraphAttrs[N] = Attrs; #else - cerr << "SelectionDAG::setGraphAttrs is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::setGraphAttrs is only available in debug builds" + << " on systems with Graphviz or gv!\n"; #endif } @@ -188,8 +188,8 @@ const std::string SelectionDAG::getGraphAttrs(const SDNode *N) const { else return ""; #else - cerr << "SelectionDAG::getGraphAttrs is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::getGraphAttrs is only available in debug builds" + << " on systems with Graphviz or gv!\n"; return std::string(""); #endif } @@ -200,8 +200,8 @@ void SelectionDAG::setGraphColor(const SDNode *N, const char *Color) { #ifndef NDEBUG NodeGraphAttrs[N] = std::string("color=") + Color; #else - cerr << "SelectionDAG::setGraphColor is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::setGraphColor is only available in debug builds" + << " on systems with Graphviz or gv!\n"; #endif } @@ -232,8 +232,8 @@ bool SelectionDAG::setSubgraphColorHelper(SDNode *N, const char *Color, DenseSet } } #else - cerr << "SelectionDAG::setSubgraphColor is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::setSubgraphColor is only available in debug builds" + << " on systems with Graphviz or gv!\n"; #endif return hit_limit; } @@ -255,8 +255,8 @@ void SelectionDAG::setSubgraphColor(SDNode *N, const char *Color) { } #else - cerr << "SelectionDAG::setSubgraphColor is only available in debug builds" - << " on systems with Graphviz or gv!\n"; + errs() << "SelectionDAG::setSubgraphColor is only available in debug builds" + << " on systems with Graphviz or gv!\n"; #endif } diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp index 806a6559df9..71ff411def2 100644 --- a/lib/Support/Debug.cpp +++ b/lib/Support/Debug.cpp @@ -27,9 +27,10 @@ #include "llvm/Support/Debug.h" using namespace llvm; +// All Debug.h functionality is a no-op in NDEBUG mode. +#ifndef NDEBUG bool llvm::DebugFlag; // DebugFlag - Exported boolean set by the -debug option -#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 @@ -48,16 +49,15 @@ static cl::opt > 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 // with the -debug-only=X option. // bool llvm::isCurrentDebugType(const char *DebugType) { -#ifndef NDEBUG return CurrentDebugType.empty() || DebugType == CurrentDebugType; +} #else - return false; +// Avoid "has no symbols" warning. +int Debug_dummy = 0; #endif -} diff --git a/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp b/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp index 71d76845adb..7a34c6fcb00 100644 --- a/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp +++ b/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp @@ -130,7 +130,7 @@ void MSP430DAGToDAGISel::InstructionSelect() { // Codegen the basic block. DEBUG(errs() << "===== Instruction selection begins:\n"); - Indent = 0; + DEBUG(Indent = 0); SelectRoot(*CurDAG); DEBUG(errs() << "===== Instruction selection ends:\n"); @@ -145,14 +145,14 @@ SDNode *MSP430DAGToDAGISel::Select(SDValue Op) { DEBUG(errs().indent(Indent) << "Selecting: "); DEBUG(Node->dump(CurDAG)); DEBUG(errs() << "\n"); - Indent += 2; + DEBUG(Indent += 2); // If we have a custom node, we already have selected! if (Node->isMachineOpcode()) { DEBUG(errs().indent(Indent-2) << "== "; Node->dump(CurDAG); errs() << "\n"); - Indent -= 2; + DEBUG(Indent -= 2); return NULL; } @@ -180,7 +180,7 @@ SDNode *MSP430DAGToDAGISel::Select(SDValue Op) { else DEBUG(ResNode->dump(CurDAG)); DEBUG(errs() << "\n"); - Indent -= 2; + DEBUG(Indent -= 2); return ResNode; } diff --git a/lib/Target/Mips/MipsISelDAGToDAG.cpp b/lib/Target/Mips/MipsISelDAGToDAG.cpp index d0641a19d71..ca72ff03dc7 100644 --- a/lib/Target/Mips/MipsISelDAGToDAG.cpp +++ b/lib/Target/Mips/MipsISelDAGToDAG.cpp @@ -112,7 +112,7 @@ void MipsDAGToDAGISel::InstructionSelect() { DEBUG(BB->dump()); // Codegen the basic block. DEBUG(errs() << "===== Instruction selection begins:\n"); - Indent = 0; + DEBUG(Indent = 0); // Select target instructions for the DAG. SelectRoot(*CurDAG); @@ -190,14 +190,14 @@ SDNode* MipsDAGToDAGISel::Select(SDValue N) { DEBUG(errs().indent(Indent) << "Selecting: "; Node->dump(CurDAG); errs() << "\n"); - Indent += 2; + DEBUG(Indent += 2); // If we have a custom node, we already have selected! if (Node->isMachineOpcode()) { DEBUG(errs().indent(Indent-2) << "== "; Node->dump(CurDAG); errs() << "\n"); - Indent -= 2; + DEBUG(Indent -= 2); return NULL; } @@ -367,7 +367,7 @@ SDNode* MipsDAGToDAGISel::Select(SDValue N) { else DEBUG(ResNode->dump(CurDAG)); DEBUG(errs() << "\n"); - Indent -= 2; + DEBUG(Indent -= 2); return ResNode; } diff --git a/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp b/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp index c31e7ddf058..6af2f610897 100644 --- a/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp +++ b/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp @@ -607,7 +607,7 @@ void SystemZDAGToDAGISel::InstructionSelect() { // Codegen the basic block. DEBUG(errs() << "===== Instruction selection begins:\n"); - Indent = 0; + DEBUG(Indent = 0); SelectRoot(*CurDAG); DEBUG(errs() << "===== Instruction selection ends:\n"); @@ -624,14 +624,14 @@ SDNode *SystemZDAGToDAGISel::Select(SDValue Op) { DEBUG(errs().indent(Indent) << "Selecting: "; Node->dump(CurDAG); errs() << "\n"); - Indent += 2; + DEBUG(Indent += 2); // If we have a custom node, we already have selected! if (Node->isMachineOpcode()) { DEBUG(errs().indent(Indent-2) << "== "; Node->dump(CurDAG); errs() << "\n"); - Indent -= 2; + DEBUG(Indent -= 2); return NULL; // Already selected. } @@ -822,7 +822,7 @@ SDNode *SystemZDAGToDAGISel::Select(SDValue Op) { ResNode->dump(CurDAG); errs() << "\n"; ); - Indent -= 2; + DEBUG(Indent -= 2); return ResNode; }