diff options
author | Quentin Colombet <qcolombet@apple.com> | 2014-04-22 02:17:11 +0000 |
---|---|---|
committer | Quentin Colombet <qcolombet@apple.com> | 2014-04-22 02:17:11 +0000 |
commit | 43285b394e30a7d9c79daed9496dac77ea15303c (patch) | |
tree | 34659380d04a033d19edaed3ee7085d9d215b0a6 /unittests | |
parent | 58f58c97f0a4bbadb81a198c340f5264344d41e1 (diff) | |
download | llvm-43285b394e30a7d9c79daed9496dac77ea15303c.tar.gz llvm-43285b394e30a7d9c79daed9496dac77ea15303c.tar.bz2 llvm-43285b394e30a7d9c79daed9496dac77ea15303c.tar.xz |
This reverts r206828 until David has time to figure out that is going on.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206839 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/Transforms/Utils/Cloning.cpp | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/unittests/Transforms/Utils/Cloning.cpp b/unittests/Transforms/Utils/Cloning.cpp index 6f8cf95fb5..fb27dc1735 100644 --- a/unittests/Transforms/Utils/Cloning.cpp +++ b/unittests/Transforms/Utils/Cloning.cpp @@ -10,6 +10,7 @@ #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/IR/Argument.h" #include "llvm/IR/Constant.h" #include "llvm/IR/DebugInfo.h" @@ -24,8 +25,6 @@ #include "llvm/IR/LLVMContext.h" #include "gtest/gtest.h" -#include <set> - using namespace llvm; namespace { @@ -39,38 +38,34 @@ protected: template <typename T> T *clone(T *V1) { Value *V2 = V1->clone(); - std::unique_ptr<Value> V(V1); - if (!Orig.insert(std::move(V)).second) - V.release(); // this wasn't the first time we added the element, so the - // set already had ownership - Clones.insert(std::unique_ptr<Value>(V2)); + Orig.insert(V1); + Clones.insert(V2); return cast<T>(V2); } - void eraseClones() { Clones.clear(); } + void eraseClones() { + DeleteContainerPointers(Clones); + } virtual void TearDown() { eraseClones(); - Orig.clear(); - V.reset(); + DeleteContainerPointers(Orig); + delete V; } - std::set<std::unique_ptr<Value>> Orig; // Erase on exit - std::set<std::unique_ptr<Value>> Clones; // Erase in eraseClones + SmallPtrSet<Value *, 4> Orig; // Erase on exit + SmallPtrSet<Value *, 4> Clones; // Erase in eraseClones LLVMContext context; - std::unique_ptr<Value> V; + Value *V; }; TEST_F(CloneInstruction, OverflowBits) { - V = make_unique<Argument>(Type::getInt32Ty(context)); + V = new Argument(Type::getInt32Ty(context)); - BinaryOperator *Add = - BinaryOperator::Create(Instruction::Add, V.get(), V.get()); - BinaryOperator *Sub = - BinaryOperator::Create(Instruction::Sub, V.get(), V.get()); - BinaryOperator *Mul = - BinaryOperator::Create(Instruction::Mul, V.get(), V.get()); + BinaryOperator *Add = BinaryOperator::Create(Instruction::Add, V, V); + BinaryOperator *Sub = BinaryOperator::Create(Instruction::Sub, V, V); + BinaryOperator *Mul = BinaryOperator::Create(Instruction::Mul, V, V); BinaryOperator *AddClone = this->clone(Add); BinaryOperator *SubClone = this->clone(Sub); @@ -136,12 +131,12 @@ TEST_F(CloneInstruction, OverflowBits) { } TEST_F(CloneInstruction, Inbounds) { - V = make_unique<Argument>(Type::getInt32PtrTy(context)); + V = new Argument(Type::getInt32PtrTy(context)); Constant *Z = Constant::getNullValue(Type::getInt32Ty(context)); std::vector<Value *> ops; ops.push_back(Z); - GetElementPtrInst *GEP = GetElementPtrInst::Create(V.get(), ops); + GetElementPtrInst *GEP = GetElementPtrInst::Create(V, ops); EXPECT_FALSE(this->clone(GEP)->isInBounds()); GEP->setIsInBounds(); @@ -149,10 +144,9 @@ TEST_F(CloneInstruction, Inbounds) { } TEST_F(CloneInstruction, Exact) { - V = make_unique<Argument>(Type::getInt32Ty(context)); + V = new Argument(Type::getInt32Ty(context)); - BinaryOperator *SDiv = - BinaryOperator::Create(Instruction::SDiv, V.get(), V.get()); + BinaryOperator *SDiv = BinaryOperator::Create(Instruction::SDiv, V, V); EXPECT_FALSE(this->clone(SDiv)->isExact()); SDiv->setIsExact(true); |