From afcd543a55c8cc6859443d9a63d52d9e8615770c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 7 Oct 2010 22:26:19 +0000 Subject: [PATCH] simplify code: don't build up vector only to assert it is empty. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115997 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86InstrInfo.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index cf8cdee2eef..b1ac36f206e 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -55,7 +55,6 @@ ReMatPICStubLoad("remat-pic-stub-load", X86InstrInfo::X86InstrInfo(X86TargetMachine &tm) : TargetInstrInfoImpl(X86Insts, array_lengthof(X86Insts)), TM(tm), RI(tm, *this) { - SmallVector AmbEntries; static const unsigned OpTbl2Addr[][2] = { { X86::ADC32ri, X86::ADC32mi }, { X86::ADC32ri8, X86::ADC32mi8 }, @@ -225,7 +224,7 @@ X86InstrInfo::X86InstrInfo(X86TargetMachine &tm) if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, std::make_pair(RegOp, AuxInfo))).second) - AmbEntries.push_back(MemOp); + assert(false && "Duplicated entries in unfolding maps?"); } // If the third value is 1, then it's folding either a load or a store. @@ -324,7 +323,7 @@ X86InstrInfo::X86InstrInfo(X86TargetMachine &tm) if (RegOp != X86::FsMOVAPDrr && RegOp != X86::FsMOVAPSrr) if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, std::make_pair(RegOp, AuxInfo))).second) - AmbEntries.push_back(MemOp); + assert(false && "Duplicated entries in unfolding maps?"); } static const unsigned OpTbl1[][3] = { @@ -449,7 +448,7 @@ X86InstrInfo::X86InstrInfo(X86TargetMachine &tm) if (RegOp != X86::FsMOVAPDrr && RegOp != X86::FsMOVAPSrr) if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, std::make_pair(RegOp, AuxInfo))).second) - AmbEntries.push_back(MemOp); + assert(false && "Duplicated entries in unfolding maps?"); } static const unsigned OpTbl2[][3] = { @@ -661,11 +660,8 @@ X86InstrInfo::X86InstrInfo(X86TargetMachine &tm) unsigned AuxInfo = 2 | (1 << 4); if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, std::make_pair(RegOp, AuxInfo))).second) - AmbEntries.push_back(MemOp); + assert(false && "Duplicated entries in unfolding maps?"); } - - // Remove ambiguous entries. - assert(AmbEntries.empty() && "Duplicated entries in unfolding maps?"); } bool -- 2.34.1