diff options
Diffstat (limited to 'unittests/ExecutionEngine/ExecutionEngineTest.cpp')
| -rw-r--r-- | unittests/ExecutionEngine/ExecutionEngineTest.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/unittests/ExecutionEngine/ExecutionEngineTest.cpp index 3e304e79860b..f23745c19dbb 100644 --- a/unittests/ExecutionEngine/ExecutionEngineTest.cpp +++ b/unittests/ExecutionEngine/ExecutionEngineTest.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "llvm/ExecutionEngine/Interpreter.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/GlobalVariable.h" #include "llvm/IR/LLVMContext.h" @@ -27,18 +26,18 @@ protected: } virtual void SetUp() { - ASSERT_TRUE(Engine.get() != NULL) << "EngineBuilder returned error: '" + ASSERT_TRUE(Engine.get() != nullptr) << "EngineBuilder returned error: '" << Error << "'"; } GlobalVariable *NewExtGlobal(Type *T, const Twine &Name) { return new GlobalVariable(*M, T, false, // Not constant. - GlobalValue::ExternalLinkage, NULL, Name); + GlobalValue::ExternalLinkage, nullptr, Name); } Module *const M; std::string Error; - const OwningPtr<ExecutionEngine> Engine; + const std::unique_ptr<ExecutionEngine> Engine; }; TEST_F(ExecutionEngineTest, ForwardGlobalMapping) { @@ -50,14 +49,14 @@ TEST_F(ExecutionEngineTest, ForwardGlobalMapping) { int32_t Mem2 = 4; Engine->updateGlobalMapping(G1, &Mem2); EXPECT_EQ(&Mem2, Engine->getPointerToGlobalIfAvailable(G1)); - Engine->updateGlobalMapping(G1, NULL); - EXPECT_EQ(NULL, Engine->getPointerToGlobalIfAvailable(G1)); + Engine->updateGlobalMapping(G1, nullptr); + EXPECT_EQ(nullptr, Engine->getPointerToGlobalIfAvailable(G1)); Engine->updateGlobalMapping(G1, &Mem2); EXPECT_EQ(&Mem2, Engine->getPointerToGlobalIfAvailable(G1)); GlobalVariable *G2 = NewExtGlobal(Type::getInt32Ty(getGlobalContext()), "Global1"); - EXPECT_EQ(NULL, Engine->getPointerToGlobalIfAvailable(G2)) + EXPECT_EQ(nullptr, Engine->getPointerToGlobalIfAvailable(G2)) << "The NULL return shouldn't depend on having called" << " updateGlobalMapping(..., NULL)"; // Check that update...() can be called before add...(). @@ -76,7 +75,7 @@ TEST_F(ExecutionEngineTest, ReverseGlobalMapping) { EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem1)); int32_t Mem2 = 4; Engine->updateGlobalMapping(G1, &Mem2); - EXPECT_EQ(NULL, Engine->getGlobalValueAtAddress(&Mem1)); + EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1)); EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem2)); GlobalVariable *G2 = @@ -84,12 +83,12 @@ TEST_F(ExecutionEngineTest, ReverseGlobalMapping) { Engine->updateGlobalMapping(G2, &Mem1); EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem1)); EXPECT_EQ(G1, Engine->getGlobalValueAtAddress(&Mem2)); - Engine->updateGlobalMapping(G1, NULL); + Engine->updateGlobalMapping(G1, nullptr); EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem1)) << "Removing one mapping doesn't affect a different one."; - EXPECT_EQ(NULL, Engine->getGlobalValueAtAddress(&Mem2)); + EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem2)); Engine->updateGlobalMapping(G2, &Mem2); - EXPECT_EQ(NULL, Engine->getGlobalValueAtAddress(&Mem1)); + EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1)); EXPECT_EQ(G2, Engine->getGlobalValueAtAddress(&Mem2)) << "Once a mapping is removed, we can point another GV at the" << " now-free address."; @@ -105,7 +104,7 @@ TEST_F(ExecutionEngineTest, ClearModuleMappings) { Engine->clearGlobalMappingsFromModule(M); - EXPECT_EQ(NULL, Engine->getGlobalValueAtAddress(&Mem1)); + EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1)); GlobalVariable *G2 = NewExtGlobal(Type::getInt32Ty(getGlobalContext()), "Global2"); @@ -125,7 +124,7 @@ TEST_F(ExecutionEngineTest, DestructionRemovesGlobalMapping) { // When the GV goes away, the ExecutionEngine should remove any // mappings that refer to it. G1->eraseFromParent(); - EXPECT_EQ(NULL, Engine->getGlobalValueAtAddress(&Mem1)); + EXPECT_EQ(nullptr, Engine->getGlobalValueAtAddress(&Mem1)); } } |