From abf46bac7e2c0b182af1ddf4de8f3847e315aa15 Mon Sep 17 00:00:00 2001 From: Sanjoy Das Date: Sun, 30 Oct 2016 23:52:50 +0000 Subject: [PATCH] Clean up test a little bit; NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285527 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Analysis/ScalarEvolutionTest.cpp | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/unittests/Analysis/ScalarEvolutionTest.cpp b/unittests/Analysis/ScalarEvolutionTest.cpp index 91a9c73cc42..46f8794a946 100644 --- a/unittests/Analysis/ScalarEvolutionTest.cpp +++ b/unittests/Analysis/ScalarEvolutionTest.cpp @@ -333,11 +333,10 @@ TEST_F(ScalarEvolutionsTest, ExpandPtrTypeSCEV) { EXPECT_TRUE(isa(Gep->getPrevNode())); } -static Instruction *getInstructionByName(Module &M, StringRef Name) { - for (auto &F : M) - for (auto &I : instructions(F)) - if (I.getName() == Name) - return &I; +static Instruction *getInstructionByName(Function &F, StringRef Name) { + for (auto &I : instructions(F)) + if (I.getName() == Name) + return &I; llvm_unreachable("Expected to find instruction!"); } @@ -346,7 +345,8 @@ TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) { SMDiagnostic Err; std::unique_ptr M = parseAssemblyString( "target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" " - "define void @foo(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) " + " " + "define void @f_1(i8* nocapture %arr, i32 %n, i32* %A, i32* %B) " " local_unnamed_addr { " "entry: " " %entrycond = icmp sgt i32 %n, 0 " @@ -376,7 +376,7 @@ TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) { " ret void " "} " " " - "define void @bar(i32* %X, i32* %Y, i32* %Z) { " + "define void @f_2(i32* %X, i32* %Y, i32* %Z) { " " %x = load i32, i32* %X " " %y = load i32, i32* %Y " " %z = load i32, i32* %Z " @@ -388,11 +388,11 @@ TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) { assert(!verifyModule(*M) && "Must have been well formed!"); { - auto *IV0 = getInstructionByName(*M, "iv0"); - auto *IV0Inc = getInstructionByName(*M, "iv0.inc"); + auto *F = M->getFunction("f_1"); + ASSERT_NE(F, nullptr); - auto *F = M->getFunction("foo"); - assert(F && "Expected!"); + auto *IV0 = getInstructionByName(*F, "iv0"); + auto *IV0Inc = getInstructionByName(*F, "iv0.inc"); ScalarEvolution SE = buildSE(*F); auto *FirstExprForIV0 = SE.getSCEV(IV0); @@ -405,14 +405,14 @@ TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) { } { - auto *F = M->getFunction("bar"); - assert(F && "Expected!"); + auto *F = M->getFunction("f_2"); + ASSERT_NE(F, nullptr); ScalarEvolution SE = buildSE(*F); - auto *LoadArg0 = SE.getSCEV(getInstructionByName(*M, "x")); - auto *LoadArg1 = SE.getSCEV(getInstructionByName(*M, "y")); - auto *LoadArg2 = SE.getSCEV(getInstructionByName(*M, "z")); + auto *LoadArg0 = SE.getSCEV(getInstructionByName(*F, "x")); + auto *LoadArg1 = SE.getSCEV(getInstructionByName(*F, "y")); + auto *LoadArg2 = SE.getSCEV(getInstructionByName(*F, "z")); auto *MulA = SE.getMulExpr(LoadArg0, LoadArg1); auto *MulB = SE.getMulExpr(LoadArg1, LoadArg0); -- 2.49.0