From e37fe9b3a1cadceb42ac27fa0718f5a10ea2f0e6 Mon Sep 17 00:00:00 2001 From: Jim Laskey Date: Tue, 11 Jul 2006 17:58:07 +0000 Subject: [PATCH] Ensure that dump calls that are associated with asserts are removed from non-debug build. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29105 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/IPA/Andersens.cpp | 5 ++--- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 14 +++++++++++++- lib/CodeGen/SelectionDAG/ScheduleDAG.cpp | 2 +- lib/Target/Alpha/AlphaISelDAGToDAG.cpp | 2 +- lib/Target/IA64/IA64ISelDAGToDAG.cpp | 2 +- lib/Target/PowerPC/PPCCodeEmitter.cpp | 2 +- utils/TableGen/DAGISelEmitter.cpp | 8 ++++---- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp index 11886936c86..fa9071b9922 100644 --- a/lib/Analysis/IPA/Andersens.cpp +++ b/lib/Analysis/IPA/Andersens.cpp @@ -260,9 +260,8 @@ namespace { std::map::iterator I = ValueNodes.find(V); if (I == ValueNodes.end()) { - V->dump(); - assert(I != ValueNodes.end() && - "Value does not have a node in the points-to graph!"); + DEBUG(V->dump()); + assert(0 && "Value does not have a node in the points-to graph!"); } return &GraphNodes[I->second]; } diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index a798f554fcc..6fe5249af16 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -540,7 +540,9 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { return Result.getValue(Op.ResNo); } // Otherwise this is an unhandled builtin node. splat. +#ifndef NDEBUG std::cerr << "NODE: "; Node->dump(); std::cerr << "\n"; +#endif assert(0 && "Do not know how to legalize this operator!"); abort(); case ISD::GlobalAddress: @@ -2865,7 +2867,9 @@ SDOperand SelectionDAGLegalize::PromoteOp(SDOperand Op) { case ISD::CopyFromReg: assert(0 && "CopyFromReg must be legal!"); default: +#ifndef NDEBUG std::cerr << "NODE: "; Node->dump(); std::cerr << "\n"; +#endif assert(0 && "Do not know how to promote this operator!"); abort(); case ISD::UNDEF: @@ -4205,7 +4209,9 @@ void SelectionDAGLegalize::ExpandOp(SDOperand Op, SDOperand &Lo, SDOperand &Hi){ case ISD::CopyFromReg: assert(0 && "CopyFromReg must be legal!"); default: +#ifndef NDEBUG std::cerr << "NODE: "; Node->dump(); std::cerr << "\n"; +#endif assert(0 && "Do not know how to expand this operator!"); abort(); case ISD::UNDEF: @@ -4703,7 +4709,11 @@ void SelectionDAGLegalize::SplitVectorOp(SDOperand Op, SDOperand &Lo, } switch (Node->getOpcode()) { - default: Node->dump(); assert(0 && "Unhandled operation in SplitVectorOp!"); + default: +#ifndef NDEBUG + Node->dump(); +#endif + assert(0 && "Unhandled operation in SplitVectorOp!"); case ISD::VBUILD_VECTOR: { std::vector LoOps(Node->op_begin(), Node->op_begin()+NewNumElts); LoOps.push_back(NewNumEltsNode); @@ -4820,7 +4830,9 @@ SDOperand SelectionDAGLegalize::PackVectorOp(SDOperand Op, SDOperand Result; switch (Node->getOpcode()) { default: +#ifndef NDEBUG Node->dump(); std::cerr << "\n"; +#endif assert(0 && "Unknown vector operation in PackVectorOp!"); case ISD::VADD: case ISD::VSUB: diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp index 5d404f0766f..528225223de 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp @@ -421,7 +421,7 @@ void ScheduleDAG::EmitNode(SDNode *Node, } else { switch (Node->getOpcode()) { default: - Node->dump(); + DEBUG(Node->dump()); assert(0 && "This target-independent node should have been selected!"); case ISD::EntryToken: // fall thru case ISD::TokenFactor: diff --git a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp index 7443371be3a..32d5222a025 100644 --- a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp +++ b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp @@ -303,7 +303,7 @@ void AlphaDAGToDAGISel::Select(SDOperand &Result, SDOperand Op) { bool rev = false; bool isNE = false; switch(CC) { - default: N->dump(); assert(0 && "Unknown FP comparison!"); + default: DEBUG(N->dump()); assert(0 && "Unknown FP comparison!"); case ISD::SETEQ: case ISD::SETOEQ: case ISD::SETUEQ: Opc = Alpha::CMPTEQ; break; case ISD::SETLT: case ISD::SETOLT: case ISD::SETULT: Opc = Alpha::CMPTLT; break; case ISD::SETLE: case ISD::SETOLE: case ISD::SETULE: Opc = Alpha::CMPTLE; break; diff --git a/lib/Target/IA64/IA64ISelDAGToDAG.cpp b/lib/Target/IA64/IA64ISelDAGToDAG.cpp index 0552677913c..d004f0c70c6 100644 --- a/lib/Target/IA64/IA64ISelDAGToDAG.cpp +++ b/lib/Target/IA64/IA64ISelDAGToDAG.cpp @@ -511,7 +511,7 @@ void IA64DAGToDAGISel::Select(SDOperand &Result, SDOperand Op) { N->getValueType(0) : cast(N->getOperand(3))->getVT(); unsigned Opc; switch (TypeBeingLoaded) { - default: N->dump(); assert(0 && "Cannot load this type!"); + default: DEBUG(N->dump()); assert(0 && "Cannot load this type!"); case MVT::i1: { // this is a bool Opc = IA64::LD1; // first we load a byte, then compare for != 0 if(N->getValueType(0) == MVT::i1) { // XXX: early exit! diff --git a/lib/Target/PowerPC/PPCCodeEmitter.cpp b/lib/Target/PowerPC/PPCCodeEmitter.cpp index bc0772231f5..f5ea746743a 100644 --- a/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -160,7 +160,7 @@ int PPCCodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) { Reloc = PPC::reloc_pcrel_bx; else { switch (MI.getOpcode()) { - default: MI.dump(); assert(0 && "Unknown instruction for relocation!"); + default: DEBUG(MI.dump()); assert(0 && "Unknown instruction for relocation!"); case PPC::LIS: Reloc = PPC::reloc_absolute_high; // Pointer to symbol break; diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp index bf9c27a6ac0..cef7acf70de 100644 --- a/utils/TableGen/DAGISelEmitter.cpp +++ b/utils/TableGen/DAGISelEmitter.cpp @@ -2136,7 +2136,7 @@ public: if (DefInit *Pred = dynamic_cast(Predicates->getElement(i))) { Record *Def = Pred->getDef(); if (!Def->isSubClassOf("Predicate")) { - Def->dump(); + DEBUG(Def->dump()); assert(0 && "Unknown predicate type!"); } if (!PredicateCheck.empty()) @@ -2344,7 +2344,7 @@ public: emitCheck("cast(" + RootName + utostr(OpNo) + ")->get() == ISD::" + LeafRec->getName()); } else { - Child->dump(); + DEBUG(Child->dump()); std::cerr << " "; assert(0 && "Unknown leaf type!"); } @@ -2357,7 +2357,7 @@ public: emitCheck("CN" + utostr(CTmp) + " == " +itostr(II->getValue())); } else { - Child->dump(); + DEBUG(Child->dump()); assert(0 && "Unknown leaf type!"); } } @@ -2510,7 +2510,7 @@ public: return std::make_pair(1, ResNo); } - N->dump(); + DEBUG(N->dump()); assert(0 && "Unknown leaf type!"); return std::make_pair(1, ~0U); }