[llvm] 3a47bf6 - [SandboxIR] Switch more Instruction::create() to InsertPosition (#111080)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 4 10:54:23 PDT 2024
Author: vporpo
Date: 2024-10-04T10:54:20-07:00
New Revision: 3a47bf633cfde9ab01fae2ce6f9c0876dc4952c3
URL: https://github.com/llvm/llvm-project/commit/3a47bf633cfde9ab01fae2ce6f9c0876dc4952c3
DIFF: https://github.com/llvm/llvm-project/commit/3a47bf633cfde9ab01fae2ce6f9c0876dc4952c3.diff
LOG: [SandboxIR] Switch more Instruction::create() to InsertPosition (#111080)
Added:
Modified:
llvm/include/llvm/SandboxIR/Instruction.h
llvm/lib/SandboxIR/Instruction.cpp
llvm/unittests/SandboxIR/SandboxIRTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/SandboxIR/Instruction.h b/llvm/include/llvm/SandboxIR/Instruction.h
index e4b1d7ee471578..a6dc0dbcdfc284 100644
--- a/llvm/include/llvm/SandboxIR/Instruction.h
+++ b/llvm/include/llvm/SandboxIR/Instruction.h
@@ -1259,8 +1259,7 @@ class UnreachableInst final : public Instruction {
}
public:
- static UnreachableInst *create(Instruction *InsertBefore, Context &Ctx);
- static UnreachableInst *create(BasicBlock *InsertAtEnd, Context &Ctx);
+ static UnreachableInst *create(InsertPosition Pos, Context &Ctx);
static bool classof(const Value *From);
unsigned getNumSuccessors() const { return 0; }
unsigned getUseOperandNo(const Use &Use) const final {
@@ -1280,10 +1279,7 @@ class ReturnInst final : public SingleLLVMInstructionImpl<llvm::ReturnInst> {
Context &Ctx);
public:
- static ReturnInst *create(Value *RetVal, Instruction *InsertBefore,
- Context &Ctx);
- static ReturnInst *create(Value *RetVal, BasicBlock *InsertAtEnd,
- Context &Ctx);
+ static ReturnInst *create(Value *RetVal, InsertPosition Pos, Context &Ctx);
static bool classof(const Value *From) {
return From->getSubclassID() == ClassID::Ret;
}
@@ -1432,14 +1428,7 @@ class CallInst : public CallBase {
public:
static CallInst *create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, BBIterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr = "");
- static CallInst *create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, Instruction *InsertBefore,
- Context &Ctx, const Twine &NameStr = "");
- static CallInst *create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
+ ArrayRef<Value *> Args, InsertPosition Pos,
Context &Ctx, const Twine &NameStr = "");
static bool classof(const Value *From) {
@@ -1458,16 +1447,7 @@ class InvokeInst final : public CallBase {
public:
static InvokeInst *create(FunctionType *FTy, Value *Func,
BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args, BBIterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr = "");
- static InvokeInst *create(FunctionType *FTy, Value *Func,
- BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args, Instruction *InsertBefore,
- Context &Ctx, const Twine &NameStr = "");
- static InvokeInst *create(FunctionType *FTy, Value *Func,
- BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
+ ArrayRef<Value *> Args, InsertPosition Pos,
Context &Ctx, const Twine &NameStr = "");
static bool classof(const Value *From) {
@@ -1503,18 +1483,7 @@ class CallBrInst final : public CallBase {
static CallBrInst *create(FunctionType *FTy, Value *Func,
BasicBlock *DefaultDest,
ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args, BBIterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr = "");
- static CallBrInst *create(FunctionType *FTy, Value *Func,
- BasicBlock *DefaultDest,
- ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args, Instruction *InsertBefore,
- Context &Ctx, const Twine &NameStr = "");
- static CallBrInst *create(FunctionType *FTy, Value *Func,
- BasicBlock *DefaultDest,
- ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
+ ArrayRef<Value *> Args, InsertPosition Pos,
Context &Ctx, const Twine &NameStr = "");
static bool classof(const Value *From) {
return From->getSubclassID() == ClassID::CallBr;
@@ -1543,8 +1512,8 @@ class LandingPadInst : public SingleLLVMInstructionImpl<llvm::LandingPadInst> {
public:
static LandingPadInst *create(Type *RetTy, unsigned NumReservedClauses,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name = "");
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name = "");
/// Return 'true' if this landingpad instruction is a
/// cleanup. I.e., it should be run when unwinding even if its landing pad
/// doesn't catch the exception.
@@ -1620,8 +1589,8 @@ class CatchPadInst : public FuncletPadInst {
// for now, as there is no CatchPadInst member function that can undo it.
static CatchPadInst *create(Value *ParentPad, ArrayRef<Value *> Args,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name = "");
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name = "");
static bool classof(const Value *From) {
return From->getSubclassID() == ClassID::CatchPad;
}
@@ -1634,8 +1603,8 @@ class CleanupPadInst : public FuncletPadInst {
public:
static CleanupPadInst *create(Value *ParentPad, ArrayRef<Value *> Args,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name = "");
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name = "");
static bool classof(const Value *From) {
return From->getSubclassID() == ClassID::CleanupPad;
}
diff --git a/llvm/lib/SandboxIR/Instruction.cpp b/llvm/lib/SandboxIR/Instruction.cpp
index 4208ff819fc415..78118613edb3c4 100644
--- a/llvm/lib/SandboxIR/Instruction.cpp
+++ b/llvm/lib/SandboxIR/Instruction.cpp
@@ -447,19 +447,8 @@ Value *StoreInst::getPointerOperand() const {
return Ctx.getValue(cast<llvm::StoreInst>(Val)->getPointerOperand());
}
-UnreachableInst *UnreachableInst::create(Instruction *InsertBefore,
- Context &Ctx) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- llvm::Instruction *LLVMBefore = InsertBefore->getTopmostLLVMInstruction();
- Builder.SetInsertPoint(LLVMBefore);
- llvm::UnreachableInst *NewUI = Builder.CreateUnreachable();
- return Ctx.createUnreachableInst(NewUI);
-}
-
-UnreachableInst *UnreachableInst::create(BasicBlock *InsertAtEnd,
- Context &Ctx) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(InsertAtEnd->Val));
+UnreachableInst *UnreachableInst::create(InsertPosition Pos, Context &Ctx) {
+ auto &Builder = setInsertPos(Pos);
llvm::UnreachableInst *NewUI = Builder.CreateUnreachable();
return Ctx.createUnreachableInst(NewUI);
}
@@ -478,18 +467,9 @@ ReturnInst *ReturnInst::createCommon(Value *RetVal, IRBuilder<> &Builder,
return Ctx.createReturnInst(NewRI);
}
-ReturnInst *ReturnInst::create(Value *RetVal, Instruction *InsertBefore,
- Context &Ctx) {
- llvm::Instruction *BeforeIR = InsertBefore->getTopmostLLVMInstruction();
- auto &Builder = Ctx.getLLVMIRBuilder();
- Builder.SetInsertPoint(BeforeIR);
- return createCommon(RetVal, Builder, Ctx);
-}
-
-ReturnInst *ReturnInst::create(Value *RetVal, BasicBlock *InsertAtEnd,
+ReturnInst *ReturnInst::create(Value *RetVal, InsertPosition Pos,
Context &Ctx) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(InsertAtEnd->Val));
+ auto &Builder = setInsertPos(Pos);
return createCommon(RetVal, Builder, Ctx);
}
@@ -534,14 +514,9 @@ void CallBase::setCalledFunction(Function *F) {
}
CallInst *CallInst::create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, BasicBlock::iterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
+ ArrayRef<Value *> Args, InsertPosition Pos,
+ Context &Ctx, const Twine &NameStr) {
+ auto &Builder = setInsertPos(Pos);
SmallVector<llvm::Value *> LLVMArgs;
LLVMArgs.reserve(Args.size());
for (Value *Arg : Args)
@@ -551,30 +526,11 @@ CallInst *CallInst::create(FunctionType *FTy, Value *Func,
return Ctx.createCallInst(NewCI);
}
-CallInst *CallInst::create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, Instruction *InsertBefore,
- Context &Ctx, const Twine &NameStr) {
- return CallInst::create(FTy, Func, Args, InsertBefore->getIterator(),
- InsertBefore->getParent(), Ctx, NameStr);
-}
-
-CallInst *CallInst::create(FunctionType *FTy, Value *Func,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
- Context &Ctx, const Twine &NameStr) {
- return CallInst::create(FTy, Func, Args, InsertAtEnd->end(), InsertAtEnd, Ctx,
- NameStr);
-}
-
InvokeInst *InvokeInst::create(FunctionType *FTy, Value *Func,
BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args, BBIterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
+ ArrayRef<Value *> Args, InsertPosition Pos,
+ Context &Ctx, const Twine &NameStr) {
+ auto &Builder = setInsertPos(Pos);
SmallVector<llvm::Value *> LLVMArgs;
LLVMArgs.reserve(Args.size());
for (Value *Arg : Args)
@@ -586,24 +542,6 @@ InvokeInst *InvokeInst::create(FunctionType *FTy, Value *Func,
return Ctx.createInvokeInst(Invoke);
}
-InvokeInst *InvokeInst::create(FunctionType *FTy, Value *Func,
- BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args,
- Instruction *InsertBefore, Context &Ctx,
- const Twine &NameStr) {
- return create(FTy, Func, IfNormal, IfException, Args,
- InsertBefore->getIterator(), InsertBefore->getParent(), Ctx,
- NameStr);
-}
-
-InvokeInst *InvokeInst::create(FunctionType *FTy, Value *Func,
- BasicBlock *IfNormal, BasicBlock *IfException,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
- Context &Ctx, const Twine &NameStr) {
- return create(FTy, Func, IfNormal, IfException, Args, InsertAtEnd->end(),
- InsertAtEnd, Ctx, NameStr);
-}
-
BasicBlock *InvokeInst::getNormalDest() const {
return cast<BasicBlock>(
Ctx.getValue(cast<llvm::InvokeInst>(Val)->getNormalDest()));
@@ -633,15 +571,9 @@ BasicBlock *InvokeInst::getSuccessor(unsigned SuccIdx) const {
CallBrInst *CallBrInst::create(FunctionType *FTy, Value *Func,
BasicBlock *DefaultDest,
ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args, BBIterator WhereIt,
- BasicBlock *WhereBB, Context &Ctx,
- const Twine &NameStr) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
-
+ ArrayRef<Value *> Args, InsertPosition Pos,
+ Context &Ctx, const Twine &NameStr) {
+ auto &Builder = setInsertPos(Pos);
SmallVector<llvm::BasicBlock *> LLVMIndirectDests;
LLVMIndirectDests.reserve(IndirectDests.size());
for (BasicBlock *IndDest : IndirectDests)
@@ -659,25 +591,6 @@ CallBrInst *CallBrInst::create(FunctionType *FTy, Value *Func,
return Ctx.createCallBrInst(CallBr);
}
-CallBrInst *CallBrInst::create(FunctionType *FTy, Value *Func,
- BasicBlock *DefaultDest,
- ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args,
- Instruction *InsertBefore, Context &Ctx,
- const Twine &NameStr) {
- return create(FTy, Func, DefaultDest, IndirectDests, Args,
- InsertBefore->getIterator(), InsertBefore->getParent(), Ctx,
- NameStr);
-}
-CallBrInst *CallBrInst::create(FunctionType *FTy, Value *Func,
- BasicBlock *DefaultDest,
- ArrayRef<BasicBlock *> IndirectDests,
- ArrayRef<Value *> Args, BasicBlock *InsertAtEnd,
- Context &Ctx, const Twine &NameStr) {
- return create(FTy, Func, DefaultDest, IndirectDests, Args, InsertAtEnd->end(),
- InsertAtEnd, Ctx, NameStr);
-}
-
Value *CallBrInst::getIndirectDestLabel(unsigned Idx) const {
return Ctx.getValue(cast<llvm::CallBrInst>(Val)->getIndirectDestLabel(Idx));
}
@@ -720,13 +633,9 @@ BasicBlock *CallBrInst::getSuccessor(unsigned Idx) const {
}
LandingPadInst *LandingPadInst::create(Type *RetTy, unsigned NumReservedClauses,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name) {
+ auto &Builder = setInsertPos(Pos);
llvm::LandingPadInst *LLVMI =
Builder.CreateLandingPad(RetTy->LLVMTy, NumReservedClauses, Name);
return Ctx.createLandingPadInst(LLVMI);
@@ -773,13 +682,9 @@ CatchSwitchInst *CatchPadInst::getCatchSwitch() const {
}
CatchPadInst *CatchPadInst::create(Value *ParentPad, ArrayRef<Value *> Args,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name) {
+ auto &Builder = setInsertPos(Pos);
SmallVector<llvm::Value *> LLVMArgs;
LLVMArgs.reserve(Args.size());
for (auto *Arg : Args)
@@ -790,13 +695,9 @@ CatchPadInst *CatchPadInst::create(Value *ParentPad, ArrayRef<Value *> Args,
}
CleanupPadInst *CleanupPadInst::create(Value *ParentPad, ArrayRef<Value *> Args,
- BBIterator WhereIt, BasicBlock *WhereBB,
- Context &Ctx, const Twine &Name) {
- auto &Builder = Ctx.getLLVMIRBuilder();
- if (WhereIt != WhereBB->end())
- Builder.SetInsertPoint((*WhereIt).getTopmostLLVMInstruction());
- else
- Builder.SetInsertPoint(cast<llvm::BasicBlock>(WhereBB->Val));
+ InsertPosition Pos, Context &Ctx,
+ const Twine &Name) {
+ auto &Builder = setInsertPos(Pos);
SmallVector<llvm::Value *> LLVMArgs;
LLVMArgs.reserve(Args.size());
for (auto *Arg : Args)
diff --git a/llvm/unittests/SandboxIR/SandboxIRTest.cpp b/llvm/unittests/SandboxIR/SandboxIRTest.cpp
index ff127d8ccff8f8..5f39fdc0b91334 100644
--- a/llvm/unittests/SandboxIR/SandboxIRTest.cpp
+++ b/llvm/unittests/SandboxIR/SandboxIRTest.cpp
@@ -3126,11 +3126,11 @@ define i8 @foo(i8 %val) {
// Check create(InsertBefore) a void ReturnInst.
auto *NewRet1 = cast<sandboxir::ReturnInst>(
- sandboxir::ReturnInst::create(nullptr, /*InsertBefore=*/Ret, Ctx));
+ sandboxir::ReturnInst::create(nullptr, Ret->getIterator(), Ctx));
EXPECT_EQ(NewRet1->getReturnValue(), nullptr);
// Check create(InsertBefore) a non-void ReturnInst.
auto *NewRet2 = cast<sandboxir::ReturnInst>(
- sandboxir::ReturnInst::create(Val, /*InsertBefore=*/Ret, Ctx));
+ sandboxir::ReturnInst::create(Val, Ret->getIterator(), Ctx));
EXPECT_EQ(NewRet2->getReturnValue(), Val);
// Check create(InsertAtEnd) a void ReturnInst.
@@ -3318,7 +3318,7 @@ define i8 @foo(i8 %arg) {
{
// Check create() WhereIt.
auto *Call = cast<sandboxir::CallInst>(sandboxir::CallInst::create(
- FTy, &F, Args, /*WhereIt=*/Ret->getIterator(), BB, Ctx));
+ FTy, &F, Args, /*WhereIt=*/Ret->getIterator(), Ctx));
EXPECT_EQ(Call->getNextNode(), Ret);
EXPECT_EQ(Call->getCalledFunction(), &F);
EXPECT_EQ(range_size(Call->args()), 1u);
@@ -3327,7 +3327,7 @@ define i8 @foo(i8 %arg) {
{
// Check create() InsertBefore.
auto *Call = cast<sandboxir::CallInst>(
- sandboxir::CallInst::create(FTy, &F, Args, /*InsertBefore=*/Ret, Ctx));
+ sandboxir::CallInst::create(FTy, &F, Args, Ret->getIterator(), Ctx));
EXPECT_EQ(Call->getNextNode(), Ret);
EXPECT_EQ(Call->getCalledFunction(), &F);
EXPECT_EQ(range_size(Call->args()), 1u);
@@ -3406,7 +3406,7 @@ define void @foo(i8 %arg) {
auto *InsertBefore = &*BB0->begin();
auto *NewInvoke = cast<sandboxir::InvokeInst>(sandboxir::InvokeInst::create(
F.getFunctionType(), &F, NormalBB, ExceptionBB, Args,
- /*WhereIt=*/InsertBefore->getIterator(), /*WhereBB=*/BB0, Ctx));
+ InsertBefore->getIterator(), Ctx));
EXPECT_EQ(NewInvoke->getNormalDest(), NormalBB);
EXPECT_EQ(NewInvoke->getUnwindDest(), ExceptionBB);
EXPECT_EQ(NewInvoke->getNextNode(), InsertBefore);
@@ -3415,9 +3415,9 @@ define void @foo(i8 %arg) {
// Check create() InsertBefore.
SmallVector<sandboxir::Value *> Args({Arg});
auto *InsertBefore = &*BB0->begin();
- auto *NewInvoke = cast<sandboxir::InvokeInst>(
- sandboxir::InvokeInst::create(F.getFunctionType(), &F, NormalBB,
- ExceptionBB, Args, InsertBefore, Ctx));
+ auto *NewInvoke = cast<sandboxir::InvokeInst>(sandboxir::InvokeInst::create(
+ F.getFunctionType(), &F, NormalBB, ExceptionBB, Args,
+ InsertBefore->getIterator(), Ctx));
EXPECT_EQ(NewInvoke->getNormalDest(), NormalBB);
EXPECT_EQ(NewInvoke->getUnwindDest(), ExceptionBB);
EXPECT_EQ(NewInvoke->getNextNode(), InsertBefore);
@@ -3426,8 +3426,7 @@ define void @foo(i8 %arg) {
// Check create() InsertAtEnd.
SmallVector<sandboxir::Value *> Args({Arg});
auto *NewInvoke = cast<sandboxir::InvokeInst>(sandboxir::InvokeInst::create(
- F.getFunctionType(), &F, NormalBB, ExceptionBB, Args,
- /*InsertAtEnd=*/BB0, Ctx));
+ F.getFunctionType(), &F, NormalBB, ExceptionBB, Args, BB0, Ctx));
EXPECT_EQ(NewInvoke->getNormalDest(), NormalBB);
EXPECT_EQ(NewInvoke->getUnwindDest(), ExceptionBB);
EXPECT_EQ(NewInvoke->getParent(), BB0);
@@ -3516,8 +3515,7 @@ define void @foo(i8 %arg) {
// Check create() WhereIt, WhereBB.
SmallVector<sandboxir::Value *> Args({Arg});
auto *NewCallBr = cast<sandboxir::CallBrInst>(sandboxir::CallBrInst::create(
- F.getFunctionType(), &F, BB1, {BB2}, Args, /*WhereIt=*/BB0->end(),
- /*WhereBB=*/BB0, Ctx));
+ F.getFunctionType(), &F, BB1, {BB2}, Args, BB0->end(), Ctx));
EXPECT_EQ(NewCallBr->getDefaultDest(), BB1);
EXPECT_EQ(NewCallBr->getIndirectDests().size(), 1u);
EXPECT_EQ(NewCallBr->getIndirectDests()[0], BB2);
@@ -3528,8 +3526,9 @@ define void @foo(i8 %arg) {
// Check create() InsertBefore
SmallVector<sandboxir::Value *> Args({Arg});
auto *InsertBefore = &*BB0->rbegin();
- auto *NewCallBr = cast<sandboxir::CallBrInst>(sandboxir::CallBrInst::create(
- F.getFunctionType(), &F, BB1, {BB2}, Args, InsertBefore, Ctx));
+ auto *NewCallBr = cast<sandboxir::CallBrInst>(
+ sandboxir::CallBrInst::create(F.getFunctionType(), &F, BB1, {BB2}, Args,
+ InsertBefore->getIterator(), Ctx));
EXPECT_EQ(NewCallBr->getDefaultDest(), BB1);
EXPECT_EQ(NewCallBr->getIndirectDests().size(), 1u);
EXPECT_EQ(NewCallBr->getIndirectDests()[0], BB2);
@@ -3538,9 +3537,8 @@ define void @foo(i8 %arg) {
{
// Check create() InsertAtEnd.
SmallVector<sandboxir::Value *> Args({Arg});
- auto *NewCallBr = cast<sandboxir::CallBrInst>(
- sandboxir::CallBrInst::create(F.getFunctionType(), &F, BB1, {BB2}, Args,
- /*InsertAtEnd=*/BB0, Ctx));
+ auto *NewCallBr = cast<sandboxir::CallBrInst>(sandboxir::CallBrInst::create(
+ F.getFunctionType(), &F, BB1, {BB2}, Args, BB0, Ctx));
EXPECT_EQ(NewCallBr->getDefaultDest(), BB1);
EXPECT_EQ(NewCallBr->getIndirectDests().size(), 1u);
EXPECT_EQ(NewCallBr->getIndirectDests()[0], BB2);
@@ -3599,10 +3597,9 @@ define void @foo() {
EXPECT_EQ(LPad->isFilter(Idx), LLVMLPad->isFilter(Idx));
// Check create().
auto *BBRet = &*BB->begin();
- auto *NewLPad =
- cast<sandboxir::LandingPadInst>(sandboxir::LandingPadInst::create(
- sandboxir::Type::getInt8Ty(Ctx), 0, BBRet->getIterator(),
- BBRet->getParent(), Ctx, "NewLPad"));
+ auto *NewLPad = cast<sandboxir::LandingPadInst>(
+ sandboxir::LandingPadInst::create(sandboxir::Type::getInt8Ty(Ctx), 0,
+ BBRet->getIterator(), Ctx, "NewLPad"));
EXPECT_EQ(NewLPad->getNextNode(), BBRet);
EXPECT_FALSE(NewLPad->isCleanup());
#ifndef NDEBUG
@@ -3681,7 +3678,7 @@ define void @foo() {
}
// Check CatchPadInst::create().
auto *NewCPI = cast<sandboxir::CatchPadInst>(sandboxir::CatchPadInst::create(
- CS, {}, BBRet->getIterator(), BB, Ctx, "NewCPI"));
+ CS, {}, BBRet->getIterator(), Ctx, "NewCPI"));
EXPECT_EQ(NewCPI->getCatchSwitch(), CS);
EXPECT_EQ(NewCPI->arg_size(), 0u);
EXPECT_EQ(NewCPI->getNextNode(), BBRet);
@@ -3691,7 +3688,7 @@ define void @foo() {
// Check CleanupPadInst::create().
auto *NewCLPI =
cast<sandboxir::CleanupPadInst>(sandboxir::CleanupPadInst::create(
- CS, {}, BBRet->getIterator(), BB, Ctx, "NewCLPI"));
+ CS, {}, BBRet->getIterator(), Ctx, "NewCLPI"));
EXPECT_EQ(NewCLPI->getParentPad(), CS);
EXPECT_EQ(NewCLPI->arg_size(), 0u);
EXPECT_EQ(NewCLPI->getNextNode(), BBRet);
@@ -5965,7 +5962,7 @@ define void @foo() {
EXPECT_EQ(UI->getNumOfIRInstrs(), 1u);
// Check create(InsertBefore)
sandboxir::UnreachableInst *NewUI =
- sandboxir::UnreachableInst::create(/*InsertBefore=*/UI, Ctx);
+ sandboxir::UnreachableInst::create(UI->getIterator(), Ctx);
EXPECT_EQ(NewUI->getNextNode(), UI);
// Check create(InsertAtEnd)
sandboxir::UnreachableInst *NewUIEnd =
More information about the llvm-commits
mailing list