From 97e60d9e8cf83274a1e4ac6443ed6da76d4b6088 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 14 May 2008 21:08:07 +0000 Subject: [PATCH] Use a better idiom to silence compiler warnings. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51131 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/ScheduleDAG.cpp | 25 +++++------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp index bca279a97b2..70365e2babf 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp @@ -406,11 +406,8 @@ void ScheduleDAG::EmitCopyFromReg(SDNode *Node, unsigned ResNo, // Just use the input register directly! if (InstanceNo > 0) VRBaseMap.erase(SDOperand(Node, ResNo)); -#ifndef NDEBUG bool isNew = VRBaseMap.insert(std::make_pair(SDOperand(Node,ResNo),SrcReg)); -#else - VRBaseMap.insert(std::make_pair(SDOperand(Node,ResNo),SrcReg)); -#endif + isNew = isNew; // Silence compiler warning. assert(isNew && "Node emitted out of order - early"); return; } @@ -468,11 +465,8 @@ void ScheduleDAG::EmitCopyFromReg(SDNode *Node, unsigned ResNo, if (InstanceNo > 0) VRBaseMap.erase(SDOperand(Node, ResNo)); -#ifndef NDEBUG bool isNew = VRBaseMap.insert(std::make_pair(SDOperand(Node,ResNo), VRBase)); -#else - VRBaseMap.insert(std::make_pair(SDOperand(Node,ResNo), VRBase)); -#endif + isNew = isNew; // Silence compiler warning. assert(isNew && "Node emitted out of order - early"); } @@ -529,11 +523,8 @@ void ScheduleDAG::CreateVirtualRegisters(SDNode *Node, MachineInstr *MI, MI->addOperand(MachineOperand::CreateReg(VRBase, true)); } -#ifndef NDEBUG bool isNew = VRBaseMap.insert(std::make_pair(SDOperand(Node,i), VRBase)); -#else - VRBaseMap.insert(std::make_pair(SDOperand(Node,i), VRBase)); -#endif + isNew = isNew; // Silence compiler warning. assert(isNew && "Node emitted out of order - early"); } } @@ -785,11 +776,8 @@ void ScheduleDAG::EmitSubregNode(SDNode *Node, } else assert(0 && "Node is not insert_subreg, extract_subreg, or subreg_to_reg"); -#ifndef NDEBUG bool isNew = VRBaseMap.insert(std::make_pair(SDOperand(Node,0), VRBase)); -#else - VRBaseMap.insert(std::make_pair(SDOperand(Node,0), VRBase)); -#endif + isNew = isNew; // Silence compiler warning. assert(isNew && "Node emitted out of order - early"); } @@ -1016,11 +1004,8 @@ void ScheduleDAG::EmitCrossRCCopy(SUnit *SU, // Copy from physical register. assert(I->Reg && "Unknown physical register!"); unsigned VRBase = MRI.createVirtualRegister(SU->CopyDstRC); -#ifndef NDEBUG bool isNew = VRBaseMap.insert(std::make_pair(SU, VRBase)); -#else - VRBaseMap.insert(std::make_pair(SU, VRBase)); -#endif + isNew = isNew; // Silence compiler warning. assert(isNew && "Node emitted out of order - early"); TII->copyRegToReg(*BB, BB->end(), VRBase, I->Reg, SU->CopyDstRC, SU->CopySrcRC); -- 2.34.1