diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp index 2269464c6c5..336a2bdc658 100644 --- a/lib/Archive/ArchiveWriter.cpp +++ b/lib/Archive/ArchiveWriter.cpp @@ -306,8 +306,10 @@ Archive::writeSymbolTable(std::ofstream& ARFile) { // Write the header ARFile.write((char*)&Hdr, sizeof(Hdr)); +#ifndef NDEBUG // Save the starting position of the symbol tables data content. unsigned startpos = ARFile.tellp(); +#endif // Write out the symbols sequentially for ( Archive::SymTabType::iterator I = symTab.begin(), E = symTab.end(); @@ -321,8 +323,10 @@ Archive::writeSymbolTable(std::ofstream& ARFile) { ARFile.write(I->first.data(), I->first.length()); } +#ifndef NDEBUG // Now that we're done with the symbol table, get the ending file position unsigned endpos = ARFile.tellp(); +#endif // Make sure that the amount we wrote is what we pre-computed. This is // critical for file integrity purposes. diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index a51291298b9..2a979e19eb5 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -125,6 +125,7 @@ void LiveIntervals::computeNumbering() { I != E; ++I) { bool inserted = mi2iMap_.insert(std::make_pair(I, MIIndex)).second; assert(inserted && "multiple MachineInstr -> index mappings"); + inserted = true; i2miMap_.push_back(I); MIIndex += InstrSlots::NUM; FunctionSize++; diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index 9fe42f644d6..ecfebc55114 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -678,6 +678,7 @@ void LiveVariables::removeVirtualRegistersKilled(MachineInstr *MI) { if (TargetRegisterInfo::isVirtualRegister(Reg)) { bool removed = getVarInfo(Reg).removeKill(MI); assert(removed && "kill not in register's VarInfo?"); + removed = true; } } } diff --git a/lib/CodeGen/LowerSubregs.cpp b/lib/CodeGen/LowerSubregs.cpp index 6ee955d3796..6d7c5ccee60 100644 --- a/lib/CodeGen/LowerSubregs.cpp +++ b/lib/CodeGen/LowerSubregs.cpp @@ -152,7 +152,9 @@ bool LowerSubregsInstructionPass::LowerInsert(MachineInstr *MI) { MI->getOperand(3).isImm() && "Invalid insert_subreg"); unsigned DstReg = MI->getOperand(0).getReg(); +#ifndef NDEBUG unsigned SrcReg = MI->getOperand(1).getReg(); +#endif unsigned InsReg = MI->getOperand(2).getReg(); unsigned SubIdx = MI->getOperand(3).getImm(); diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp index f5c68ab82cf..a7e4d6eec44 100644 --- a/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp @@ -341,6 +341,7 @@ namespace { UGE = UGT | EQ_BIT }; +#ifndef NDEBUG /// validPredicate - determines whether a given value is actually a lattice /// value. Only used in assertions or debugging. static bool validPredicate(LatticeVal LV) { @@ -355,6 +356,7 @@ namespace { return false; } } +#endif /// reversePredicate - reverse the direction of the inequality static LatticeVal reversePredicate(LatticeVal LV) { diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp index 313723cfefa..c220c2bcc16 100644 --- a/lib/Transforms/Scalar/Reassociate.cpp +++ b/lib/Transforms/Scalar/Reassociate.cpp @@ -53,6 +53,7 @@ namespace { } } +#ifndef DEBUG /// PrintOps - Print out the expression identified in the Ops list. /// static void PrintOps(Instruction *I, const std::vector &Ops) { @@ -64,6 +65,7 @@ static void PrintOps(Instruction *I, const std::vector &Ops) { cerr << "," << Ops[i].Rank; } } +#endif namespace { class VISIBILITY_HIDDEN Reassociate : public FunctionPass { @@ -282,6 +284,7 @@ void Reassociate::LinearizeExprTree(BinaryOperator *I, std::swap(LHS, RHS); bool Success = !I->swapOperands(); assert(Success && "swapOperands failed"); + Success = false; MadeChange = true; } } else if (RHSBO) { diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 3e08b59aa41..66caf5f9f0e 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -2204,6 +2204,7 @@ CastInst::getCastOpcode( if (const VectorType *SrcPTy = dyn_cast(SrcTy)) { assert(DestPTy->getBitWidth() == SrcPTy->getBitWidth() && "Casting vector to vector of different widths"); + SrcPTy = NULL; return BitCast; // vector -> vector } else if (DestPTy->getBitWidth() == SrcBits) { return BitCast; // float/int -> vector