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
This commit is contained in:
Daniel Dunbar 2009-08-23 08:50:52 +00:00
parent d9ea85ab01
commit 43ed267db3
8 changed files with 40 additions and 38 deletions

View File

@ -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

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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<bool, true>
@ -48,16 +49,15 @@ 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
// with the -debug-only=X option.
//
bool llvm::isCurrentDebugType(const char *DebugType) {
#ifndef NDEBUG
return CurrentDebugType.empty() || DebugType == CurrentDebugType;
#else
return false;
#endif
}
#else
// Avoid "has no symbols" warning.
int Debug_dummy = 0;
#endif

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}