From c6a4f5e819217e1e12c458aed8e7b122e23a3a58 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 21 Jul 2014 00:45:20 -0700 Subject: Update LLVM for rebase to r212749. Includes a cherry-pick of: r212948 - fixes a small issue with atomic calls Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18 --- unittests/Analysis/CFGTest.cpp | 17 +++++++++-------- unittests/Analysis/MixedTBAATest.cpp | 2 +- unittests/Analysis/ScalarEvolutionTest.cpp | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'unittests/Analysis') diff --git a/unittests/Analysis/CFGTest.cpp b/unittests/Analysis/CFGTest.cpp index 8d8c560..ac5e710 100644 --- a/unittests/Analysis/CFGTest.cpp +++ b/unittests/Analysis/CFGTest.cpp @@ -46,10 +46,10 @@ protected: } Function *F = M->getFunction("test"); - if (F == NULL) + if (F == nullptr) report_fatal_error("Test must have a function named @test"); - A = B = NULL; + A = B = nullptr; for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) { if (I->hasName()) { if (I->getName() == "A") @@ -58,9 +58,9 @@ protected: B = &*I; } } - if (A == NULL) + if (A == nullptr) report_fatal_error("@test must have an instruction %A"); - if (B == NULL) + if (B == nullptr) report_fatal_error("@test must have an instruction %B"); } @@ -74,7 +74,7 @@ protected: static int initialize() { PassInfo *PI = new PassInfo("isPotentiallyReachable testing pass", - "", &ID, 0, true, true); + "", &ID, nullptr, true, true); PassRegistry::getPassRegistry()->registerPass(*PI, false); initializeLoopInfoPass(*PassRegistry::getPassRegistry()); initializeDominatorTreeWrapperPassPass( @@ -95,9 +95,10 @@ protected: LoopInfo *LI = &getAnalysis(); DominatorTree *DT = &getAnalysis().getDomTree(); - EXPECT_EQ(isPotentiallyReachable(A, B, 0, 0), ExpectedResult); - EXPECT_EQ(isPotentiallyReachable(A, B, DT, 0), ExpectedResult); - EXPECT_EQ(isPotentiallyReachable(A, B, 0, LI), ExpectedResult); + EXPECT_EQ(isPotentiallyReachable(A, B, nullptr, nullptr), + ExpectedResult); + EXPECT_EQ(isPotentiallyReachable(A, B, DT, nullptr), ExpectedResult); + EXPECT_EQ(isPotentiallyReachable(A, B, nullptr, LI), ExpectedResult); EXPECT_EQ(isPotentiallyReachable(A, B, DT, LI), ExpectedResult); return false; } diff --git a/unittests/Analysis/MixedTBAATest.cpp b/unittests/Analysis/MixedTBAATest.cpp index 2cf7c73..142e047 100644 --- a/unittests/Analysis/MixedTBAATest.cpp +++ b/unittests/Analysis/MixedTBAATest.cpp @@ -43,7 +43,7 @@ TEST_F(MixedTBAATest, MixedTBAA) { auto *Store1 = new StoreInst(Value, Addr, BB); auto *Store2 = new StoreInst(Value, Addr, BB); - ReturnInst::Create(C, 0, BB); + ReturnInst::Create(C, nullptr, BB); // New TBAA metadata { diff --git a/unittests/Analysis/ScalarEvolutionTest.cpp b/unittests/Analysis/ScalarEvolutionTest.cpp index 398d09e..90f6997 100644 --- a/unittests/Analysis/ScalarEvolutionTest.cpp +++ b/unittests/Analysis/ScalarEvolutionTest.cpp @@ -41,7 +41,7 @@ TEST_F(ScalarEvolutionsTest, SCEVUnknownRAUW) { std::vector(), false); Function *F = cast(M.getOrInsertFunction("f", FTy)); BasicBlock *BB = BasicBlock::Create(Context, "entry", F); - ReturnInst::Create(Context, 0, BB); + ReturnInst::Create(Context, nullptr, BB); Type *Ty = Type::getInt1Ty(Context); Constant *Init = Constant::getNullValue(Ty); @@ -94,7 +94,7 @@ TEST_F(ScalarEvolutionsTest, SCEVMultiplyAddRecs) { FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context), Types, false); Function *F = cast(M.getOrInsertFunction("f", FTy)); BasicBlock *BB = BasicBlock::Create(Context, "entry", F); - ReturnInst::Create(Context, 0, BB); + ReturnInst::Create(Context, nullptr, BB); // Create a ScalarEvolution and "run" it so that it gets initialized. PM.add(&SE); -- cgit v1.1