From 4104c006584bcf72b9b3c7c6aa684d2220903196 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Tue, 30 Oct 2018 20:33:58 +0000 Subject: [PATCH] [ScalarizeMaskedMemIntrin] Limit the scope of some variables that are only used inside loops. llvm-svn: 345638 --- llvm/lib/CodeGen/ScalarizeMaskedMemIntrin.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/llvm/lib/CodeGen/ScalarizeMaskedMemIntrin.cpp b/llvm/lib/CodeGen/ScalarizeMaskedMemIntrin.cpp index 1fb116e..2684f92 100644 --- a/llvm/lib/CodeGen/ScalarizeMaskedMemIntrin.cpp +++ b/llvm/lib/CodeGen/ScalarizeMaskedMemIntrin.cpp @@ -138,8 +138,6 @@ static void scalarizeMaskedLoad(CallInst *CI) { IRBuilder<> Builder(CI->getContext()); Instruction *InsertPt = CI; BasicBlock *IfBlock = CI->getParent(); - BasicBlock *CondBlock = nullptr; - BasicBlock *PrevIfBlock = CI->getParent(); Builder.SetInsertPoint(InsertPt); Builder.SetCurrentDebugLocation(CI->getDebugLoc()); @@ -195,7 +193,8 @@ static void scalarizeMaskedLoad(CallInst *CI) { // %Elt = load i32* %EltAddr // VResult = insertelement <16 x i32> VResult, i32 %Elt, i32 Idx // - CondBlock = IfBlock->splitBasicBlock(InsertPt->getIterator(), "cond.load"); + BasicBlock *CondBlock = IfBlock->splitBasicBlock(InsertPt->getIterator(), + "cond.load"); Builder.SetInsertPoint(InsertPt); Value *Gep = @@ -211,7 +210,7 @@ static void scalarizeMaskedLoad(CallInst *CI) { Instruction *OldBr = IfBlock->getTerminator(); BranchInst::Create(CondBlock, NewIfBlock, Predicate, OldBr); OldBr->eraseFromParent(); - PrevIfBlock = IfBlock; + BasicBlock *PrevIfBlock = IfBlock; IfBlock = NewIfBlock; // Create the phi to join the new and previous value. @@ -372,8 +371,6 @@ static void scalarizeMaskedGather(CallInst *CI) { IRBuilder<> Builder(CI->getContext()); Instruction *InsertPt = CI; BasicBlock *IfBlock = CI->getParent(); - BasicBlock *CondBlock = nullptr; - BasicBlock *PrevIfBlock = CI->getParent(); Builder.SetInsertPoint(InsertPt); unsigned AlignVal = cast(Alignment)->getZExtValue(); @@ -416,7 +413,7 @@ static void scalarizeMaskedGather(CallInst *CI) { // %Elt = load i32* %EltAddr // VResult = insertelement <16 x i32> VResult, i32 %Elt, i32 Idx // - CondBlock = IfBlock->splitBasicBlock(InsertPt, "cond.load"); + BasicBlock *CondBlock = IfBlock->splitBasicBlock(InsertPt, "cond.load"); Builder.SetInsertPoint(InsertPt); Value *Ptr = Builder.CreateExtractElement(Ptrs, Builder.getInt32(Idx), @@ -433,7 +430,7 @@ static void scalarizeMaskedGather(CallInst *CI) { Instruction *OldBr = IfBlock->getTerminator(); BranchInst::Create(CondBlock, NewIfBlock, Predicate, OldBr); OldBr->eraseFromParent(); - PrevIfBlock = IfBlock; + BasicBlock *PrevIfBlock = IfBlock; IfBlock = NewIfBlock; PHINode *Phi = Builder.CreatePHI(VecType, 2, "res.phi.else"); -- 2.7.4