This is an archive of the discontinued LLVM Phabricator instance.

Differential D76269

[opaque pointer types] Remove deprecated Instruction/IRBuilder APIs.
ClosedPublic

Authored by efriedma on Mar 16 2020, 10:43 PM.

Details

Reviewers
nhaehnle
t.p.northover
dblaikie
bollu
Commits
rG836ce9db7f13: [opaque pointer types] Remove deprecated Instruction/IRBuilder APIs.
Summary

Removes deprecated overloads of LoadInst constructor, CallInst::Create, InvokeInst::Create, IRBuilder::CreateCall, IRBuilder::CreateInvoke. (Leaving around deprecated IRBuilder::CreateLoad for now.)

Diff Detail

Event Timeline

efriedma created this revision.Mar 16 2020, 10:43 PM
Herald added a reviewer: bollu. · View Herald TranscriptMar 16 2020, 10:43 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: cfe-commits, jfb. · View Herald Transcript
Harbormaster failed remote builds in B49395: Diff 250694!Mar 16 2020, 11:25 PM
dblaikie added a comment.Mar 17 2020, 1:03 PM

Probably worth committing the fixes separately from the API removal (so if the removal has to be rolled back the fixes can be left as-is). @t.p.northover - any thoughts on the removal?

efriedma updated this revision to Diff 254971.Apr 3 2020, 6:03 PM

Commited the non-header changes separately

Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2020, 6:03 PM
efriedma mentioned this in rG501ec31b5960: [llvm-stress][opaque pointers] Remove use of deprecated constructor.Apr 3 2020, 6:26 PM
efriedma mentioned this in rG3e5d671c1910: [polly][opaque pointers] Remove use of deprecated APIs..
efriedma mentioned this in rGb11decc221a6: [clang codegen][opaque pointers] Remove use of deprecated constructor.
efriedma mentioned this in D77454: LoadInst should store Align, not MaybeAlign..Apr 6 2020, 11:18 AM
efriedma added a comment.Apr 7 2020, 7:19 PM

Ping

dblaikie accepted this revision.Apr 9 2020, 12:53 PM

Sounds good - thanks!

This revision is now accepted and ready to land.Apr 9 2020, 12:53 PM
Closed by commit rG836ce9db7f13: [opaque pointer types] Remove deprecated Instruction/IRBuilder APIs. (authored by efriedma). · Explain WhyApr 9 2020, 1:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
include/
llvm/
IR/
39 lines
129 lines

Diff 256395

llvm/include/llvm/IR/IRBuilder.h

Show First 20 Lines • Show All 1,000 Lines • ▼ Show 20 Linespublic:
InvokeInst *CreateInvoke(FunctionCallee Callee, BasicBlock *NormalDest, InvokeInst *CreateInvoke(FunctionCallee Callee, BasicBlock *NormalDest,
BasicBlock *UnwindDest, BasicBlock *UnwindDest,
ArrayRef<Value *> Args = None, ArrayRef<Value *> Args = None,
const Twine &Name = "") { const Twine &Name = "") {
return CreateInvoke(Callee.getFunctionType(), Callee.getCallee(), return CreateInvoke(Callee.getFunctionType(), Callee.getCallee(),
NormalDest, UnwindDest, Args, Name); 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. /// \brief Create a callbr instruction.
CallBrInst *CreateCallBr(FunctionType *Ty, Value *Callee, CallBrInst *CreateCallBr(FunctionType *Ty, Value *Callee,
BasicBlock *DefaultDest, BasicBlock *DefaultDest,
ArrayRef<BasicBlock *> IndirectDests, ArrayRef<BasicBlock *> IndirectDests,
ArrayRef<Value *> Args = None, ArrayRef<Value *> Args = None,
const Twine &Name = "") { const Twine &Name = "") {
return Insert(CallBrInst::Create(Ty, Callee, DefaultDest, IndirectDests, return Insert(CallBrInst::Create(Ty, Callee, DefaultDest, IndirectDests,
Args), Name); Args), Name);
▲ Show 20 Lines • Show All 1,305 Lines • ▼ Show 20 Linespublic:
CallInst *CreateCall(FunctionCallee Callee, ArrayRef<Value *> Args, CallInst *CreateCall(FunctionCallee Callee, ArrayRef<Value *> Args,
ArrayRef<OperandBundleDef> OpBundles, ArrayRef<OperandBundleDef> OpBundles,
const Twine &Name = "", MDNode *FPMathTag = nullptr) { const Twine &Name = "", MDNode *FPMathTag = nullptr) {
return CreateCall(Callee.getFunctionType(), Callee.getCallee(), Args, return CreateCall(Callee.getFunctionType(), Callee.getCallee(), Args,
OpBundles, Name, FPMathTag); 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( CallInst *CreateConstrainedFPCall(
Function *Callee, ArrayRef<Value *> Args, const Twine &Name = "", Function *Callee, ArrayRef<Value *> Args, const Twine &Name = "",
Optional<RoundingMode> Rounding = None, Optional<RoundingMode> Rounding = None,
Optional<fp::ExceptionBehavior> Except = None); Optional<fp::ExceptionBehavior> Except = None);
Value *CreateSelect(Value *C, Value *True, Value *False, Value *CreateSelect(Value *C, Value *True, Value *False,
const Twine &Name = "", Instruction *MDFrom = nullptr); const Twine &Name = "", Instruction *MDFrom = nullptr);
▲ Show 20 Lines • Show All 260 Lines • Show Last 20 Lines

llvm/include/llvm/IR/Instructions.h

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Linespublic:
LoadInst(Type *Ty, Value *Ptr, const Twine &NameStr, bool isVolatile, LoadInst(Type *Ty, Value *Ptr, const Twine &NameStr, bool isVolatile,
MaybeAlign Align, AtomicOrdering Order, MaybeAlign Align, AtomicOrdering Order,
SyncScope::ID SSID = SyncScope::System, SyncScope::ID SSID = SyncScope::System,
Instruction *InsertBefore = nullptr); Instruction *InsertBefore = nullptr);
LoadInst(Type *Ty, Value *Ptr, const Twine &NameStr, bool isVolatile, LoadInst(Type *Ty, Value *Ptr, const Twine &NameStr, bool isVolatile,
MaybeAlign Align, AtomicOrdering Order, SyncScope::ID SSID, MaybeAlign Align, AtomicOrdering Order, SyncScope::ID SSID,
BasicBlock *InsertAtEnd); 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. /// Return true if this is a load from a volatile memory location.
bool isVolatile() const { return getSubclassDataFromInstruction() & 1; } bool isVolatile() const { return getSubclassDataFromInstruction() & 1; }
/// Specify whether this is a volatile load or not. /// Specify whether this is a volatile load or not.
void setVolatile(bool V) { void setVolatile(bool V) {
setInstructionSubclassData((getSubclassDataFromInstruction() & ~1) | setInstructionSubclassData((getSubclassDataFromInstruction() & ~1) |
(V ? 1 : 0)); (V ? 1 : 0));
} }
▲ Show 20 Lines • Show All 1,294 Lines • ▼ Show 20 Linespublic:
static CallInst *Create(FunctionCallee Func, ArrayRef<Value *> Args, static CallInst *Create(FunctionCallee Func, ArrayRef<Value *> Args,
ArrayRef<OperandBundleDef> Bundles, ArrayRef<OperandBundleDef> Bundles,
const Twine &NameStr, BasicBlock *InsertAtEnd) { const Twine &NameStr, BasicBlock *InsertAtEnd) {
return Create(Func.getFunctionType(), Func.getCallee(), Args, Bundles, return Create(Func.getFunctionType(), Func.getCallee(), Args, Bundles,
NameStr, InsertAtEnd); 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 different set of operand bundles and /// Create a clone of \p CI with a different set of operand bundles and
/// insert it before \p InsertPt. /// insert it before \p InsertPt.
/// ///
/// The returned call instruction is identical \p CI in every way except that /// The returned call instruction is identical \p CI in every way except that
/// the operand bundles for the new instruction are set to the operand bundles /// the operand bundles for the new instruction are set to the operand bundles
/// in \p Bundles. /// in \p Bundles.
static CallInst *Create(CallInst *CI, ArrayRef<OperandBundleDef> Bundles, static CallInst *Create(CallInst *CI, ArrayRef<OperandBundleDef> Bundles,
Instruction *InsertPt = nullptr); Instruction *InsertPt = nullptr);
▲ Show 20 Lines • Show All 2,193 Lines • ▼ Show 20 Linespublic:
static InvokeInst *Create(FunctionCallee Func, BasicBlock *IfNormal, static InvokeInst *Create(FunctionCallee Func, BasicBlock *IfNormal,
BasicBlock *IfException, ArrayRef<Value *> Args, BasicBlock *IfException, ArrayRef<Value *> Args,
ArrayRef<OperandBundleDef> Bundles, ArrayRef<OperandBundleDef> Bundles,
const Twine &NameStr, BasicBlock *InsertAtEnd) { const Twine &NameStr, BasicBlock *InsertAtEnd) {
return Create(Func.getFunctionType(), Func.getCallee(), IfNormal, return Create(Func.getFunctionType(), Func.getCallee(), IfNormal,
IfException, Args, Bundles, NameStr, InsertAtEnd); 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 different set of operand bundles and /// Create a clone of \p II with a different set of operand bundles and
/// insert it before \p InsertPt. /// insert it before \p InsertPt.
/// ///
/// The returned invoke instruction is identical to \p II in every way except /// The returned invoke instruction is identical to \p II in every way except
/// that the operand bundles for the new instruction are set to the operand /// that the operand bundles for the new instruction are set to the operand
/// bundles in \p Bundles. /// bundles in \p Bundles.
static InvokeInst *Create(InvokeInst *II, ArrayRef<OperandBundleDef> Bundles, static InvokeInst *Create(InvokeInst *II, ArrayRef<OperandBundleDef> Bundles,
Instruction *InsertPt = nullptr); Instruction *InsertPt = nullptr);
▲ Show 20 Lines • Show All 1,501 Lines • Show Last 20 Lines