diff options
| -rw-r--r-- | include/llvm/ADT/SmallVector.h | 2 | ||||
| -rw-r--r-- | lib/CodeGen/BranchFolding.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/IfConversion.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h index 05952a4490..fdecb6c448 100644 --- a/include/llvm/ADT/SmallVector.h +++ b/include/llvm/ADT/SmallVector.h @@ -477,7 +477,7 @@ class SmallVector : public SmallVectorImpl<T> { // NumInlineEltsElts - The number of elements actually in this array. There // is already one in the parent class, and we have to round up to avoid // having a zero-element array. - NumInlineEltsElts = (MinUs - 1) > 0 ? (MinUs - 1) : 1, + NumInlineEltsElts = MinUs > 1 ? (MinUs - 1) : 1, // NumTsAvailable - The number of T's we actually have space for, which may // be more than N due to rounding. diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index c97f176d74..2ccfd191a0 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -364,7 +364,7 @@ void BranchFolder::ReplaceTailWithBranchTo(MachineBasicBlock::iterator OldInst, // If OldBB isn't immediately before OldBB, insert a branch to it. if (++MachineFunction::iterator(OldBB) != MachineFunction::iterator(NewDest)) - TII->InsertBranch(*OldBB, NewDest, 0, SmallVector<MachineOperand, 1>()); + TII->InsertBranch(*OldBB, NewDest, 0, SmallVector<MachineOperand, 0>()); OldBB->addSuccessor(NewDest); ++NumTailMerge; } @@ -444,7 +444,7 @@ static void FixTail(MachineBasicBlock* CurMBB, MachineBasicBlock *SuccBB, } } } - TII->InsertBranch(*CurMBB, SuccBB, NULL, SmallVector<MachineOperand, 1>()); + TII->InsertBranch(*CurMBB, SuccBB, NULL, SmallVector<MachineOperand, 0>()); } static bool MergeCompare(const std::pair<unsigned,MachineBasicBlock*> &p, diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp index d98b0ceb2d..079b701648 100644 --- a/lib/CodeGen/IfConversion.cpp +++ b/lib/CodeGen/IfConversion.cpp @@ -815,7 +815,7 @@ void IfConverter::InvalidatePreds(MachineBasicBlock *BB) { /// static void InsertUncondBranch(MachineBasicBlock *BB, MachineBasicBlock *ToBB, const TargetInstrInfo *TII) { - SmallVector<MachineOperand, 1> NoCond; + SmallVector<MachineOperand, 0> NoCond; TII->InsertBranch(*BB, ToBB, NULL, NoCond); } |