[llvm] f515ca8 - [IRBuilder] Remove Align-related deprecated APIs
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 13 07:42:48 PST 2021
Author: Nikita Popov
Date: 2021-02-13T16:42:37+01:00
New Revision: f515ca8995ce3695c6e92d83ffca2012dc753bb3
URL: https://github.com/llvm/llvm-project/commit/f515ca8995ce3695c6e92d83ffca2012dc753bb3
DIFF: https://github.com/llvm/llvm-project/commit/f515ca8995ce3695c6e92d83ffca2012dc753bb3.diff
LOG: [IRBuilder] Remove Align-related deprecated APIs
This removes IRBuilder methods accepting unsigned alignments
in favor of their Align/MaybeAlign variants. These methods have
been deprecated for more than a year at this point, so they
should be safe to remove.
Added:
Modified:
llvm/include/llvm/IR/IRBuilder.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index 9cefc9aa764c..c12159faf12c 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -664,32 +664,6 @@ class IRBuilderBase {
MDNode *TBAAStructTag = nullptr, MDNode *ScopeTag = nullptr,
MDNode *NoAliasTag = nullptr);
- LLVM_ATTRIBUTE_DEPRECATED(CallInst *CreateElementUnorderedAtomicMemCpy(
- Value *Dst, unsigned DstAlign, Value *Src,
- unsigned SrcAlign, uint64_t Size,
- uint32_t ElementSize, MDNode *TBAATag = nullptr,
- MDNode *TBAAStructTag = nullptr,
- MDNode *ScopeTag = nullptr,
- MDNode *NoAliasTag = nullptr),
- "Use the version that takes Align instead") {
- return CreateElementUnorderedAtomicMemCpy(
- Dst, Align(DstAlign), Src, Align(SrcAlign), getInt64(Size), ElementSize,
- TBAATag, TBAAStructTag, ScopeTag, NoAliasTag);
- }
-
- LLVM_ATTRIBUTE_DEPRECATED(CallInst *CreateElementUnorderedAtomicMemCpy(
- Value *Dst, unsigned DstAlign, Value *Src,
- unsigned SrcAlign, Value *Size,
- uint32_t ElementSize, MDNode *TBAATag = nullptr,
- MDNode *TBAAStructTag = nullptr,
- MDNode *ScopeTag = nullptr,
- MDNode *NoAliasTag = nullptr),
- "Use the version that takes Align instead") {
- return CreateElementUnorderedAtomicMemCpy(
- Dst, Align(DstAlign), Src, Align(SrcAlign), Size, ElementSize, TBAATag,
- TBAAStructTag, ScopeTag, NoAliasTag);
- }
-
CallInst *CreateMemMove(Value *Dst, MaybeAlign DstAlign, Value *Src,
MaybeAlign SrcAlign, uint64_t Size,
bool isVolatile = false, MDNode *TBAATag = nullptr,
@@ -720,32 +694,6 @@ class IRBuilderBase {
MDNode *TBAAStructTag = nullptr, MDNode *ScopeTag = nullptr,
MDNode *NoAliasTag = nullptr);
- LLVM_ATTRIBUTE_DEPRECATED(CallInst *CreateElementUnorderedAtomicMemMove(
- Value *Dst, unsigned DstAlign, Value *Src,
- unsigned SrcAlign, uint64_t Size,
- uint32_t ElementSize, MDNode *TBAATag = nullptr,
- MDNode *TBAAStructTag = nullptr,
- MDNode *ScopeTag = nullptr,
- MDNode *NoAliasTag = nullptr),
- "Use the version that takes Align instead") {
- return CreateElementUnorderedAtomicMemMove(
- Dst, Align(DstAlign), Src, Align(SrcAlign), getInt64(Size), ElementSize,
- TBAATag, TBAAStructTag, ScopeTag, NoAliasTag);
- }
-
- LLVM_ATTRIBUTE_DEPRECATED(CallInst *CreateElementUnorderedAtomicMemMove(
- Value *Dst, unsigned DstAlign, Value *Src,
- unsigned SrcAlign, Value *Size,
- uint32_t ElementSize, MDNode *TBAATag = nullptr,
- MDNode *TBAAStructTag = nullptr,
- MDNode *ScopeTag = nullptr,
- MDNode *NoAliasTag = nullptr),
- "Use the version that takes Align instead") {
- return CreateElementUnorderedAtomicMemMove(
- Dst, Align(DstAlign), Src, Align(SrcAlign), Size, ElementSize, TBAATag,
- TBAAStructTag, ScopeTag, NoAliasTag);
- }
-
/// Create a vector fadd reduction intrinsic of the source vector.
/// The first parameter is a scalar accumulator value for ordered reductions.
CallInst *CreateFAddReduce(Value *Acc, Value *Src);
@@ -801,51 +749,18 @@ class IRBuilderBase {
CallInst *CreateInvariantStart(Value *Ptr, ConstantInt *Size = nullptr);
/// Create a call to Masked Load intrinsic
- LLVM_ATTRIBUTE_DEPRECATED(
- CallInst *CreateMaskedLoad(Value *Ptr, unsigned Alignment, Value *Mask,
- Value *PassThru = nullptr,
- const Twine &Name = ""),
- "Use the version that takes Align instead") {
- return CreateMaskedLoad(Ptr, assumeAligned(Alignment), Mask, PassThru,
- Name);
- }
CallInst *CreateMaskedLoad(Value *Ptr, Align Alignment, Value *Mask,
Value *PassThru = nullptr, const Twine &Name = "");
/// Create a call to Masked Store intrinsic
- LLVM_ATTRIBUTE_DEPRECATED(CallInst *CreateMaskedStore(Value *Val, Value *Ptr,
- unsigned Alignment,
- Value *Mask),
- "Use the version that takes Align instead") {
- return CreateMaskedStore(Val, Ptr, assumeAligned(Alignment), Mask);
- }
-
CallInst *CreateMaskedStore(Value *Val, Value *Ptr, Align Alignment,
Value *Mask);
- /// Create a call to Masked Gather intrinsic
- LLVM_ATTRIBUTE_DEPRECATED(
- CallInst *CreateMaskedGather(Value *Ptrs, unsigned Alignment,
- Value *Mask = nullptr,
- Value *PassThru = nullptr,
- const Twine &Name = ""),
- "Use the version that takes Align instead") {
- return CreateMaskedGather(Ptrs, Align(Alignment), Mask, PassThru, Name);
- }
-
/// Create a call to Masked Gather intrinsic
CallInst *CreateMaskedGather(Value *Ptrs, Align Alignment,
Value *Mask = nullptr, Value *PassThru = nullptr,
const Twine &Name = "");
- /// Create a call to Masked Scatter intrinsic
- LLVM_ATTRIBUTE_DEPRECATED(
- CallInst *CreateMaskedScatter(Value *Val, Value *Ptrs, unsigned Alignment,
- Value *Mask = nullptr),
- "Use the version that takes Align instead") {
- return CreateMaskedScatter(Val, Ptrs, Align(Alignment), Mask);
- }
-
/// Create a call to Masked Scatter intrinsic
CallInst *CreateMaskedScatter(Value *Val, Value *Ptrs, Align Alignment,
Value *Mask = nullptr);
@@ -1738,35 +1653,16 @@ class IRBuilderBase {
return CreateAlignedStore(Val, Ptr, MaybeAlign(), isVolatile);
}
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr,
- unsigned Align,
- const char *Name),
- "Use the version that takes NaybeAlign instead") {
- return CreateAlignedLoad(Ty, Ptr, MaybeAlign(Align), Name);
- }
LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr, MaybeAlign Align,
const char *Name) {
return CreateAlignedLoad(Ty, Ptr, Align, /*isVolatile*/false, Name);
}
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr,
- unsigned Align,
- const Twine &Name = ""),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedLoad(Ty, Ptr, MaybeAlign(Align), Name);
- }
LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr, MaybeAlign Align,
const Twine &Name = "") {
return CreateAlignedLoad(Ty, Ptr, Align, /*isVolatile*/false, Name);
}
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr,
- unsigned Align,
- bool isVolatile,
- const Twine &Name = ""),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedLoad(Ty, Ptr, MaybeAlign(Align), isVolatile, Name);
- }
LoadInst *CreateAlignedLoad(Type *Ty, Value *Ptr, MaybeAlign Align,
bool isVolatile, const Twine &Name = "") {
if (!Align) {
@@ -1776,31 +1672,6 @@ class IRBuilderBase {
return Insert(new LoadInst(Ty, Ptr, Twine(), isVolatile, *Align), Name);
}
- // Deprecated [opaque pointer types]
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Value *Ptr,
- unsigned Align,
- const char *Name),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedLoad(Ptr->getType()->getPointerElementType(), Ptr,
- MaybeAlign(Align), Name);
- }
- // Deprecated [opaque pointer types]
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Value *Ptr,
- unsigned Align,
- const Twine &Name = ""),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedLoad(Ptr->getType()->getPointerElementType(), Ptr,
- MaybeAlign(Align), Name);
- }
- // Deprecated [opaque pointer types]
- LLVM_ATTRIBUTE_DEPRECATED(LoadInst *CreateAlignedLoad(Value *Ptr,
- unsigned Align,
- bool isVolatile,
- const Twine &Name = ""),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedLoad(Ptr->getType()->getPointerElementType(), Ptr,
- MaybeAlign(Align), isVolatile, Name);
- }
// Deprecated [opaque pointer types]
LoadInst *CreateAlignedLoad(Value *Ptr, MaybeAlign Align, const char *Name) {
return CreateAlignedLoad(Ptr->getType()->getPointerElementType(), Ptr,
@@ -1819,12 +1690,6 @@ class IRBuilderBase {
Align, isVolatile, Name);
}
- LLVM_ATTRIBUTE_DEPRECATED(
- StoreInst *CreateAlignedStore(Value *Val, Value *Ptr, unsigned Align,
- bool isVolatile = false),
- "Use the version that takes MaybeAlign instead") {
- return CreateAlignedStore(Val, Ptr, MaybeAlign(Align), isVolatile);
- }
StoreInst *CreateAlignedStore(Value *Val, Value *Ptr, MaybeAlign Align,
bool isVolatile = false) {
if (!Align) {
More information about the llvm-commits
mailing list