[llvm] 836ce9d - [opaque pointer types] Remove deprecated Instruction/IRBuilder APIs.
Eli Friedman via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 9 13:44:10 PDT 2020
Author: Eli Friedman
Date: 2020-04-09T13:42:36-07:00
New Revision: 836ce9db7f13f15bd8e4c00ab7a07d2b9f946b5e
URL: https://github.com/llvm/llvm-project/commit/836ce9db7f13f15bd8e4c00ab7a07d2b9f946b5e
DIFF: https://github.com/llvm/llvm-project/commit/836ce9db7f13f15bd8e4c00ab7a07d2b9f946b5e.diff
LOG: [opaque pointer types] Remove deprecated Instruction/IRBuilder APIs.
Removes deprecated overloads of LoadInst constructor, CallInst::create,
InvokeInst::Create, IRBuilder::CreateCall, IRBuilder::CreateInvoke.
(Leaving around deprecated IRBuilder::CreateLoad for now.)
Differential Revision: https://reviews.llvm.org/D76269
Added:
Modified:
llvm/include/llvm/IR/IRBuilder.h
llvm/include/llvm/IR/Instructions.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index b7ed3b9055bc..75a7980b9e76 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -1006,28 +1006,6 @@ class IRBuilderBase {
NormalDest, UnwindDest, Args, Name);
}
- // Deprecated [opaque pointer types]
- InvokeInst *CreateInvoke(Value *Callee, BasicBlock *NormalDest,
- BasicBlock *UnwindDest, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> OpBundles,
- const Twine &Name = "") {
- return CreateInvoke(
- cast<FunctionType>(
- cast<PointerType>(Callee->getType())->getElementType()),
- Callee, NormalDest, UnwindDest, Args, OpBundles, Name);
- }
-
- // Deprecated [opaque pointer types]
- InvokeInst *CreateInvoke(Value *Callee, BasicBlock *NormalDest,
- BasicBlock *UnwindDest,
- ArrayRef<Value *> Args = None,
- const Twine &Name = "") {
- return CreateInvoke(
- cast<FunctionType>(
- cast<PointerType>(Callee->getType())->getElementType()),
- Callee, NormalDest, UnwindDest, Args, Name);
- }
-
/// \brief Create a callbr instruction.
CallBrInst *CreateCallBr(FunctionType *Ty, Value *Callee,
BasicBlock *DefaultDest,
@@ -2349,23 +2327,6 @@ class IRBuilderBase {
OpBundles, Name, FPMathTag);
}
- // Deprecated [opaque pointer types]
- CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args = None,
- const Twine &Name = "", MDNode *FPMathTag = nullptr) {
- return CreateCall(
- cast<FunctionType>(Callee->getType()->getPointerElementType()), Callee,
- Args, Name, FPMathTag);
- }
-
- // Deprecated [opaque pointer types]
- CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> OpBundles,
- const Twine &Name = "", MDNode *FPMathTag = nullptr) {
- return CreateCall(
- cast<FunctionType>(Callee->getType()->getPointerElementType()), Callee,
- Args, OpBundles, Name, FPMathTag);
- }
-
CallInst *CreateConstrainedFPCall(
Function *Callee, ArrayRef<Value *> Args, const Twine &Name = "",
Optional<RoundingMode> Rounding = None,
diff --git a/llvm/include/llvm/IR/Instructions.h b/llvm/include/llvm/IR/Instructions.h
index 857b7374ac47..8e433d10d497 100644
--- a/llvm/include/llvm/IR/Instructions.h
+++ b/llvm/include/llvm/IR/Instructions.h
@@ -199,40 +199,6 @@ class LoadInst : public UnaryInstruction {
MaybeAlign Align, AtomicOrdering Order, SyncScope::ID SSID,
BasicBlock *InsertAtEnd);
- // Deprecated [opaque pointer types]
- explicit LoadInst(Value *Ptr, const Twine &NameStr = "",
- Instruction *InsertBefore = nullptr)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- InsertBefore) {}
- LoadInst(Value *Ptr, const Twine &NameStr, BasicBlock *InsertAtEnd)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- InsertAtEnd) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile,
- Instruction *InsertBefore = nullptr)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, InsertBefore) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile,
- BasicBlock *InsertAtEnd)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, InsertAtEnd) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile, MaybeAlign Align,
- Instruction *InsertBefore = nullptr)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, Align, InsertBefore) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile, MaybeAlign Align,
- BasicBlock *InsertAtEnd)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, Align, InsertAtEnd) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile, MaybeAlign Align,
- AtomicOrdering Order, SyncScope::ID SSID = SyncScope::System,
- Instruction *InsertBefore = nullptr)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, Align, Order, SSID, InsertBefore) {}
- LoadInst(Value *Ptr, const Twine &NameStr, bool isVolatile, MaybeAlign Align,
- AtomicOrdering Order, SyncScope::ID SSID, BasicBlock *InsertAtEnd)
- : LoadInst(Ptr->getType()->getPointerElementType(), Ptr, NameStr,
- isVolatile, Align, Order, SSID, InsertAtEnd) {}
-
/// Return true if this is a load from a volatile memory location.
bool isVolatile() const { return getSubclassDataFromInstruction() & 1; }
@@ -1543,58 +1509,6 @@ class CallInst : public CallBase {
NameStr, InsertAtEnd);
}
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, const Twine &NameStr = "",
- Instruction *InsertBefore = nullptr) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, NameStr, InsertBefore);
- }
-
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, ArrayRef<Value *> Args,
- const Twine &NameStr,
- Instruction *InsertBefore = nullptr) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, Args, NameStr, InsertBefore);
- }
-
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> Bundles = None,
- const Twine &NameStr = "",
- Instruction *InsertBefore = nullptr) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, Args, Bundles, NameStr, InsertBefore);
- }
-
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, const Twine &NameStr,
- BasicBlock *InsertAtEnd) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, NameStr, InsertAtEnd);
- }
-
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, ArrayRef<Value *> Args,
- const Twine &NameStr, BasicBlock *InsertAtEnd) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, Args, NameStr, InsertAtEnd);
- }
-
- // Deprecated [opaque pointer types]
- static CallInst *Create(Value *Func, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> Bundles,
- const Twine &NameStr, BasicBlock *InsertAtEnd) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, Args, Bundles, NameStr, InsertAtEnd);
- }
-
/// Create a clone of \p CI with a
diff erent set of operand bundles and
/// insert it before \p InsertPt.
///
@@ -3804,49 +3718,6 @@ class InvokeInst : public CallBase {
IfException, Args, Bundles, NameStr, InsertAtEnd);
}
- // Deprecated [opaque pointer types]
- static InvokeInst *Create(Value *Func, BasicBlock *IfNormal,
- BasicBlock *IfException, ArrayRef<Value *> Args,
- const Twine &NameStr,
- Instruction *InsertBefore = nullptr) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, IfNormal, IfException, Args, None, NameStr,
- InsertBefore);
- }
-
- // Deprecated [opaque pointer types]
- static InvokeInst *Create(Value *Func, BasicBlock *IfNormal,
- BasicBlock *IfException, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> Bundles = None,
- const Twine &NameStr = "",
- Instruction *InsertBefore = nullptr) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, IfNormal, IfException, Args, Bundles, NameStr,
- InsertBefore);
- }
-
- // Deprecated [opaque pointer types]
- static InvokeInst *Create(Value *Func, BasicBlock *IfNormal,
- BasicBlock *IfException, ArrayRef<Value *> Args,
- const Twine &NameStr, BasicBlock *InsertAtEnd) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, IfNormal, IfException, Args, NameStr, InsertAtEnd);
- }
-
- // Deprecated [opaque pointer types]
- static InvokeInst *Create(Value *Func, BasicBlock *IfNormal,
- BasicBlock *IfException, ArrayRef<Value *> Args,
- ArrayRef<OperandBundleDef> Bundles,
- const Twine &NameStr, BasicBlock *InsertAtEnd) {
- return Create(cast<FunctionType>(
- cast<PointerType>(Func->getType())->getElementType()),
- Func, IfNormal, IfException, Args, Bundles, NameStr,
- InsertAtEnd);
- }
-
/// Create a clone of \p II with a
diff erent set of operand bundles and
/// insert it before \p InsertPt.
///
More information about the llvm-commits
mailing list