[llvm-branch-commits] [llvm] dd2aecc - Revert "Attributor: Fix build with older GCC after AAKindSet (#240975)"
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Wed Nov 18 08:48:52 PST 2026
Author: Simon Pilgrim
Date: 2026-11-18T16:48:48Z
New Revision: dd2aeccac2ab1f37ad847670938e3222ca60e0db
URL: https://github.com/llvm/llvm-project/commit/dd2aeccac2ab1f37ad847670938e3222ca60e0db
DIFF: https://github.com/llvm/llvm-project/commit/dd2aeccac2ab1f37ad847670938e3222ca60e0db.diff
LOG: Revert "Attributor: Fix build with older GCC after AAKindSet (#240975)"
This reverts commit 19901848353e558519e4d6a9c2be2c1a2ab26ea1.
Added:
Modified:
llvm/include/llvm/Transforms/IPO/Attributor.h
llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
llvm/lib/Transforms/IPO/Attributor.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Transforms/IPO/Attributor.h b/llvm/include/llvm/Transforms/IPO/Attributor.h
index b9eb3665e3924..0b9df57485d22 100644
--- a/llvm/include/llvm/Transforms/IPO/Attributor.h
+++ b/llvm/include/llvm/Transforms/IPO/Attributor.h
@@ -1413,17 +1413,13 @@ struct InformationCache {
/// declared here are tested with a bit mask, others with a list of IDs.
class AAKindSet {
public:
- /// Return the set of the kinds with the IDs \p KindIDs.
- template <const char *...KindIDs> static constexpr AAKindSet get();
+ template <size_t N> constexpr AAKindSet(const char *const (&IDs)[N]);
/// Return true if abstract attributes of type \p AAType are in the set.
template <typename AAType> bool contains() const;
private:
- constexpr AAKindSet(uint64_t Mask, ArrayRef<const char *> IDs)
- : Mask(Mask), IDs(IDs) {}
-
- uint64_t Mask;
+ uint64_t Mask = 0;
ArrayRef<const char *> IDs;
};
@@ -6458,67 +6454,76 @@ bool hasAssumedIRAttr(Attributor &A, const AbstractAttribute *QueryingAA,
} // namespace AA
namespace detail {
-template <const char *...IDs> struct AAKindIDList {};
-
/// The IDs of the abstract attributes declared here, by their bit in
/// AAKindSet.
-using AAKindIDs = AAKindIDList<
- &AANoUnwind::ID, &AANoSync::ID, &AAMustProgress::ID, &AANonNull::ID,
- &AANoRecurse::ID, &AAWillReturn::ID, &AAUndefinedBehavior::ID,
- &AAIntraFnReachability::ID, &AANoAlias::ID, &AANoFree::ID, &AANoReturn::ID,
- &AAIsDead::ID, &AADereferenceable::ID, &AAAlign::ID, &AAInstanceInfo::ID,
- &AANoCapture::ID, &AAValueSimplify::ID, &AAHeapToStack::ID,
- &AAPrivatizablePtr::ID, &AAMemoryBehavior::ID, &AAMemoryLocation::ID,
- &AAValueConstantRange::ID, &AAPotentialConstantValues::ID,
- &AAPotentialValues::ID, &AANoUndef::ID, &AANoFPClass::ID, &AACallEdges::ID,
- &AAExecutionDomain::ID, &AAInterFnReachability::ID, &AANonConvergent::ID,
- &AAPointerInfo::ID, &AAAssumptionInfo::ID, &AAUnderlyingObjects::ID,
- &AAInvariantLoadPointer::ID, &AAAddressSpace::ID, &AANoAliasAddrSpace::ID,
- &AAAllocationInfo::ID, &AAGlobalValueInfo::ID, &AAIndirectCallInfo::ID,
- &AADenormalFPMath::ID>;
-
-template <const char *...IDs>
-constexpr size_t getNumAAKinds(AAKindIDList<IDs...>) {
- return sizeof...(IDs);
-}
-
-constexpr size_t NumAAKinds = getNumAAKinds(AAKindIDs());
-static_assert(NumAAKinds <= 64, "Too many kinds for the mask");
+constexpr const char *AAKindIDs[] = {
+ &AANoUnwind::ID,
+ &AANoSync::ID,
+ &AAMustProgress::ID,
+ &AANonNull::ID,
+ &AANoRecurse::ID,
+ &AAWillReturn::ID,
+ &AAUndefinedBehavior::ID,
+ &AAIntraFnReachability::ID,
+ &AANoAlias::ID,
+ &AANoFree::ID,
+ &AANoReturn::ID,
+ &AAIsDead::ID,
+ &AADereferenceable::ID,
+ &AAAlign::ID,
+ &AAInstanceInfo::ID,
+ &AANoCapture::ID,
+ &AAValueSimplify::ID,
+ &AAHeapToStack::ID,
+ &AAPrivatizablePtr::ID,
+ &AAMemoryBehavior::ID,
+ &AAMemoryLocation::ID,
+ &AAValueConstantRange::ID,
+ &AAPotentialConstantValues::ID,
+ &AAPotentialValues::ID,
+ &AANoUndef::ID,
+ &AANoFPClass::ID,
+ &AACallEdges::ID,
+ &AAExecutionDomain::ID,
+ &AAInterFnReachability::ID,
+ &AANonConvergent::ID,
+ &AAPointerInfo::ID,
+ &AAAssumptionInfo::ID,
+ &AAUnderlyingObjects::ID,
+ &AAInvariantLoadPointer::ID,
+ &AAAddressSpace::ID,
+ &AANoAliasAddrSpace::ID,
+ &AAAllocationInfo::ID,
+ &AAGlobalValueInfo::ID,
+ &AAIndirectCallInfo::ID,
+ &AADenormalFPMath::ID,
+};
+static_assert(std::size(AAKindIDs) <= 64, "Too many kinds for the mask");
/// Return the bit of \p ID in AAKindSet, or the number of kinds if it has
-/// none. The IDs are compared as template arguments since older compilers
-/// cannot compare their addresses in constant expressions.
-template <const char *ID, const char *...IDs>
-constexpr size_t getAAKindBit(AAKindIDList<IDs...>) {
- constexpr bool Matches[] = {
- std::is_same_v<AAKindIDList<ID>, AAKindIDList<IDs>>...};
- for (size_t I = 0; I != sizeof...(IDs); ++I) {
- if (Matches[I])
+/// none.
+constexpr size_t getAAKindBit(const char *ID) {
+ for (size_t I = 0; I != std::size(AAKindIDs); ++I) {
+ if (AAKindIDs[I] == ID)
return I;
}
- return sizeof...(IDs);
+ return std::size(AAKindIDs);
}
-
-/// Return the bit of \p ID in the mask of AAKindSet, or 0 if it has none.
-template <const char *ID> constexpr uint64_t getAAKindMask() {
- constexpr size_t Bit = getAAKindBit<ID>(AAKindIDs());
- return Bit < NumAAKinds ? uint64_t(1) << Bit : 0;
-}
-
-/// The storage of the IDs of an AAKindSet.
-template <const char *...IDs>
-inline constexpr const char *AAKindSetIDs[] = {IDs...};
} // namespace detail
-template <const char *...KindIDs> constexpr AAKindSet AAKindSet::get() {
- return AAKindSet((detail::getAAKindMask<KindIDs>() | ...),
- detail::AAKindSetIDs<KindIDs...>);
+template <size_t N>
+constexpr AAKindSet::AAKindSet(const char *const (&IDs)[N]) : IDs(IDs) {
+ for (const char *ID : IDs) {
+ if (size_t Bit = detail::getAAKindBit(ID);
+ Bit < std::size(detail::AAKindIDs))
+ Mask |= uint64_t(1) << Bit;
+ }
}
template <typename AAType> bool AAKindSet::contains() const {
- constexpr uint64_t KindMask = detail::getAAKindMask<&AAType::ID>();
- if constexpr (KindMask != 0)
- return Mask & KindMask;
+ constexpr size_t Bit = detail::getAAKindBit(&AAType::ID);
+ if constexpr (Bit < std::size(detail::AAKindIDs))
+ return Mask & (uint64_t(1) << Bit);
else
return is_contained(IDs, &AAType::ID);
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
index 886583e55e17a..4ab81960a0397 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
@@ -1696,14 +1696,26 @@ static bool runImpl(SetVector<Function *> &Functions, bool IsModulePass,
CallGraphUpdater CGUpdater;
BumpPtrAllocator Allocator;
AMDGPUInformationCache InfoCache(M, AG, Allocator, nullptr, TM);
- static constexpr AAKindSet Allowed = AAKindSet::get<
- &AAAMDAttributes::ID, &AAUniformWorkGroupSize::ID, &AAPotentialValues::ID,
- &AAAMDFlatWorkGroupSize::ID, &AAAMDMaxNumWorkgroups::ID,
- &AAAMDWavesPerEU::ID, &AAAMDGPUMinAGPRAlloc::ID, &AACallEdges::ID,
- &AAPointerInfo::ID, &AAPotentialConstantValues::ID,
- &AAUnderlyingObjects::ID, &AANoAliasAddrSpace::ID, &AAAddressSpace::ID,
- &AAIndirectCallInfo::ID, &AAAMDGPUClusterDims::ID, &AAAMDGPUNoLDSDMA::ID,
- &AAAlign::ID>();
+ static constexpr const char *AllowedIDs[] = {
+ &AAAMDAttributes::ID,
+ &AAUniformWorkGroupSize::ID,
+ &AAPotentialValues::ID,
+ &AAAMDFlatWorkGroupSize::ID,
+ &AAAMDMaxNumWorkgroups::ID,
+ &AAAMDWavesPerEU::ID,
+ &AAAMDGPUMinAGPRAlloc::ID,
+ &AACallEdges::ID,
+ &AAPointerInfo::ID,
+ &AAPotentialConstantValues::ID,
+ &AAUnderlyingObjects::ID,
+ &AANoAliasAddrSpace::ID,
+ &AAAddressSpace::ID,
+ &AAIndirectCallInfo::ID,
+ &AAAMDGPUClusterDims::ID,
+ &AAAMDGPUNoLDSDMA::ID,
+ &AAAlign::ID,
+ };
+ static constexpr AAKindSet Allowed(AllowedIDs);
AttributorConfig AC(CGUpdater);
AC.IsClosedWorldModule = Options.IsClosedWorld;
diff --git a/llvm/lib/Transforms/IPO/Attributor.cpp b/llvm/lib/Transforms/IPO/Attributor.cpp
index 6ccb7a9f4b67b..534ee9c3b74bf 100644
--- a/llvm/lib/Transforms/IPO/Attributor.cpp
+++ b/llvm/lib/Transforms/IPO/Attributor.cpp
@@ -3960,14 +3960,26 @@ static bool runAttributorLightOnFunctions(InformationCache &InfoCache,
AttributorConfig AC(CGUpdater);
AC.IsModulePass = IsModulePass;
AC.DeleteFns = false;
- static constexpr AAKindSet Allowed =
- AAKindSet::get<&AAWillReturn::ID, &AANoUnwind::ID, &AANoRecurse::ID,
- &AANoSync::ID, &AANoFree::ID, &AANoReturn::ID,
- &AAMemoryLocation::ID, &AAMemoryBehavior::ID,
- &AAUnderlyingObjects::ID, &AANoCapture::ID,
- &AAInterFnReachability::ID, &AAIntraFnReachability::ID,
- &AACallEdges::ID, &AANoFPClass::ID, &AAMustProgress::ID,
- &AANonNull::ID, &AADenormalFPMath::ID>();
+ static constexpr const char *AllowedIDs[] = {
+ &AAWillReturn::ID,
+ &AANoUnwind::ID,
+ &AANoRecurse::ID,
+ &AANoSync::ID,
+ &AANoFree::ID,
+ &AANoReturn::ID,
+ &AAMemoryLocation::ID,
+ &AAMemoryBehavior::ID,
+ &AAUnderlyingObjects::ID,
+ &AANoCapture::ID,
+ &AAInterFnReachability::ID,
+ &AAIntraFnReachability::ID,
+ &AACallEdges::ID,
+ &AANoFPClass::ID,
+ &AAMustProgress::ID,
+ &AANonNull::ID,
+ &AADenormalFPMath::ID,
+ };
+ static constexpr AAKindSet Allowed(AllowedIDs);
AC.Allowed = Allowed;
AC.UseLiveness = false;
More information about the llvm-branch-commits
mailing list