[llvm] dba7313 - getAllocAlignment: respect allocalign attribute if present
Augie Fackler via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 4 13:01:00 PST 2022
Author: Augie Fackler
Date: 2022-03-04T15:57:54-05:00
New Revision: dba73135c8b7a02afb535328a7475e0a6890c271
URL: https://github.com/llvm/llvm-project/commit/dba73135c8b7a02afb535328a7475e0a6890c271
DIFF: https://github.com/llvm/llvm-project/commit/dba73135c8b7a02afb535328a7475e0a6890c271.diff
LOG: getAllocAlignment: respect allocalign attribute if present
As with allocsize(), we prefer the table data to attributes.
Differential Revision: https://reviews.llvm.org/D118263
Added:
Modified:
llvm/include/llvm/Analysis/MemoryBuiltins.h
llvm/lib/Analysis/MemoryBuiltins.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/MemoryBuiltins.h b/llvm/include/llvm/Analysis/MemoryBuiltins.h
index 0d53239e3c8fd..0c62731a7797c 100644
--- a/llvm/include/llvm/Analysis/MemoryBuiltins.h
+++ b/llvm/include/llvm/Analysis/MemoryBuiltins.h
@@ -100,7 +100,10 @@ inline CallInst *isFreeCall(Value *I, const TargetLibraryInfo *TLI) {
/// insertion or speculative execution of allocation routines.
bool isAllocRemovable(const CallBase *V, const TargetLibraryInfo *TLI);
-/// Gets the alignment argument for an aligned_alloc-like function
+/// Gets the alignment argument for an aligned_alloc-like function, using either
+/// built-in knowledge based on fuction names/signatures or allocalign
+/// attributes. Note: the Value returned may not indicate a valid alignment, per
+/// the definition of the allocalign attribute.
Value *getAllocAlignment(const CallBase *V, const TargetLibraryInfo *TLI);
/// Return the size of the requested allocation. With a trivial mapper, this is
diff --git a/llvm/lib/Analysis/MemoryBuiltins.cpp b/llvm/lib/Analysis/MemoryBuiltins.cpp
index 6e7240579efaa..4b7582b6e05ed 100644
--- a/llvm/lib/Analysis/MemoryBuiltins.cpp
+++ b/llvm/lib/Analysis/MemoryBuiltins.cpp
@@ -334,10 +334,15 @@ Value *llvm::getAllocAlignment(const CallBase *V,
assert(isAllocationFn(V, TLI));
const Optional<AllocFnsTy> FnData = getAllocationData(V, AnyAlloc, TLI);
- if (!FnData.hasValue() || FnData->AlignParam < 0) {
- return nullptr;
+ if (FnData.hasValue() && FnData->AlignParam >= 0) {
+ return V->getOperand(FnData->AlignParam);
+ }
+ unsigned AllocAlignParam;
+ if (V->getAttributes().hasAttrSomewhere(Attribute::AllocAlign,
+ &AllocAlignParam)) {
+ return V->getOperand(AllocAlignParam-1);
}
- return V->getOperand(FnData->AlignParam);
+ return nullptr;
}
/// When we're compiling N-bit code, and the user uses parameters that are
More information about the llvm-commits
mailing list