Revert "[Alignment][NFC] Deprecate CreateMemCpy/CreateMemMove" (4658da10) · Commits · llvm-doe / llvm-project

llvm/include/llvm/IR/Argument.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -76,13 +76,8 @@ public:
		bool hasByValOrInAllocaAttr() const;

		/// If this is a byval or inalloca argument, return its alignment.
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getParamAlign() instead.
		unsigned getParamAlignment() const;

		/// If this is a byval or inalloca argument, return its alignment.
		MaybeAlign getParamAlign() const;

		/// If this is a byval argument, return its type.
		Type *getParamByValType() const;

llvm/include/llvm/IR/Function.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -435,18 +435,12 @@ public:
		void addDereferenceableOrNullParamAttr(unsigned ArgNo, uint64_t Bytes);

		/// Extract the alignment for a call or parameter (0=unknown).
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getParamAlign() instead.
		unsigned getParamAlignment(unsigned ArgNo) const {
		if (const auto MA = getParamAlign(ArgNo))
		if (const auto MA = AttributeSets.getParamAlignment(ArgNo))
		return MA->value();
		return 0;
		}

		MaybeAlign getParamAlign(unsigned ArgNo) const {
		return AttributeSets.getParamAlignment(ArgNo);
		}

		/// Extract the byval type for a parameter.
		Type *getParamByValType(unsigned ArgNo) const {
		Type *Ty = AttributeSets.getParamByValType(ArgNo);

llvm/include/llvm/IR/IRBuilder.h

+21 −28

Original line number	Diff line number	Diff line
		@@ -493,14 +493,12 @@ public:
		/// and noalias tags.
		/// FIXME: Remove this function once transition to Align is over.
		/// Use the version that takes MaybeAlign instead of this one.
		LLVM_ATTRIBUTE_DEPRECATED(
		CallInst CreateMemCpy(Value Dst, unsigned DstAlign, Value *Src,
		unsigned SrcAlign, uint64_t Size,
		bool isVolatile = false, MDNode *TBAATag = nullptr,
		MDNode *TBAAStructTag = nullptr,
		MDNode *ScopeTag = nullptr,
		MDNode *NoAliasTag = nullptr),
		"Use the version that takes MaybeAlign instead") {
		MDNode *NoAliasTag = nullptr) {
		return CreateMemCpy(Dst, MaybeAlign(DstAlign), Src, MaybeAlign(SrcAlign),
		getInt64(Size), isVolatile, TBAATag, TBAAStructTag,
		ScopeTag, NoAliasTag);
		@@ -519,14 +517,12 @@ public:

		/// FIXME: Remove this function once transition to Align is over.
		/// Use the version that takes MaybeAlign instead of this one.
		LLVM_ATTRIBUTE_DEPRECATED(
		CallInst CreateMemCpy(Value Dst, unsigned DstAlign, Value *Src,
		unsigned SrcAlign, Value *Size,
		bool isVolatile = false, MDNode *TBAATag = nullptr,
		MDNode *TBAAStructTag = nullptr,
		MDNode *ScopeTag = nullptr,
		MDNode *NoAliasTag = nullptr),
		"Use the version that takes MaybeAlign instead");
		MDNode *NoAliasTag = nullptr);
		CallInst CreateMemCpy(Value Dst, MaybeAlign DstAlign, Value *Src,
		MaybeAlign SrcAlign, Value *Size,
		bool isVolatile = false, MDNode *TBAATag = nullptr,
		@@ -566,12 +562,10 @@ public:
		/// and noalias tags.
		/// FIXME: Remove this function once transition to Align is over.
		/// Use the version that takes MaybeAlign instead of this one.
		LLVM_ATTRIBUTE_DEPRECATED(
		CallInst *CreateMemMove(
		Value Dst, unsigned DstAlign, Value Src, unsigned SrcAlign,
		uint64_t Size, bool isVolatile = false, MDNode *TBAATag = nullptr,
		MDNode ScopeTag = nullptr, MDNode NoAliasTag = nullptr),
		"Use the version that takes MaybeAlign") {
		CallInst CreateMemMove(Value Dst, unsigned DstAlign, Value *Src, unsigned SrcAlign,
		uint64_t Size, bool isVolatile = false,
		MDNode TBAATag = nullptr, MDNode ScopeTag = nullptr,
		MDNode *NoAliasTag = nullptr) {
		return CreateMemMove(Dst, DstAlign, Src, SrcAlign, getInt64(Size), isVolatile,
		TBAATag, ScopeTag, NoAliasTag);
		}
		@@ -585,12 +579,11 @@ public:
		}
		/// FIXME: Remove this function once transition to Align is over.
		/// Use the version that takes MaybeAlign instead of this one.
		LLVM_ATTRIBUTE_DEPRECATED(
		CallInst *CreateMemMove(
		Value Dst, unsigned DstAlign, Value Src, unsigned SrcAlign,
		Value Size, bool isVolatile = false, MDNode TBAATag = nullptr,
		MDNode ScopeTag = nullptr, MDNode NoAliasTag = nullptr),
		"Use the version that takes MaybeAlign") {
		CallInst CreateMemMove(Value Dst, unsigned DstAlign, Value *Src,
		unsigned SrcAlign, Value *Size,
		bool isVolatile = false, MDNode *TBAATag = nullptr,
		MDNode *ScopeTag = nullptr,
		MDNode *NoAliasTag = nullptr) {
		return CreateMemMove(Dst, MaybeAlign(DstAlign), Src, MaybeAlign(SrcAlign),
		Size, isVolatile, TBAATag, ScopeTag, NoAliasTag);
		}

llvm/include/llvm/IR/InstrTypes.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -1585,31 +1585,19 @@ public:
		}

		/// Extract the alignment of the return value.
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getRetAlign() instead.
		unsigned getRetAlignment() const {
		if (const auto MA = Attrs.getRetAlignment())
		return MA->value();
		return 0;
		}

		/// Extract the alignment of the return value.
		MaybeAlign getRetAlign() const { return Attrs.getRetAlignment(); }

		/// Extract the alignment for a call or parameter (0=unknown).
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getParamAlign() instead.
		unsigned getParamAlignment(unsigned ArgNo) const {
		if (const auto MA = Attrs.getParamAlignment(ArgNo))
		return MA->value();
		return 0;
		}

		/// Extract the alignment for a call or parameter (0=unknown).
		MaybeAlign getParamAlign(unsigned ArgNo) const {
		return Attrs.getParamAlignment(ArgNo);
		}

		/// Extract the byval type for a call or parameter.
		Type *getParamByValType(unsigned ArgNo) const {
		Type *Ty = Attrs.getParamByValType(ArgNo);

llvm/include/llvm/IR/Instructions.h

+6 −17

Original line number	Diff line number	Diff line
		@@ -239,20 +239,14 @@ public:
		}

		/// Return the alignment of the access that is being performed.
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getAlign() instead.
		unsigned getAlignment() const {
		if (const auto MA = getAlign())
		if (const auto MA =
		decodeMaybeAlign((getSubclassDataFromInstruction() >> 1) & 31))
		return MA->value();
		return 0;
		}

		/// Return the alignment of the access that is being performed.
		MaybeAlign getAlign() const {
		return decodeMaybeAlign((getSubclassDataFromInstruction() >> 1) & 31);
		}

		void setAlignment(MaybeAlign Alignment);
		void setAlignment(MaybeAlign Align);

		/// Returns the ordering constraint of this load instruction.
		AtomicOrdering getOrdering() const {
		@@ -371,19 +365,14 @@ public:
		DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);

		/// Return the alignment of the access that is being performed
		/// FIXME: Remove this function once transition to Align is over.
		/// Use getAlign() instead.
		unsigned getAlignment() const {
		if (const auto MA = getAlign())
		if (const auto MA =
		decodeMaybeAlign((getSubclassDataFromInstruction() >> 1) & 31))
		return MA->value();
		return 0;
		}

		MaybeAlign getAlign() const {
		return decodeMaybeAlign((getSubclassDataFromInstruction() >> 1) & 31);
		}

		void setAlignment(MaybeAlign Alignment);
		void setAlignment(MaybeAlign Align);

		/// Returns the ordering constraint of this store instruction.
		AtomicOrdering getOrdering() const {