Skip to content

AST: Give CustomAvailabilityDomain 8 byte alignment #84529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
Merged

AST: Give CustomAvailabilityDomain 8 byte alignment #84529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion include/swift/AST/AvailabilityDomain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "swift/AST/AvailabilityRange.h"
#include "swift/AST/Identifier.h"
#include "swift/AST/PlatformKindUtils.h"
#include "swift/AST/TypeAlignments.h"
#include "swift/Basic/Assertions.h"
#include "swift/Basic/LLVM.h"
#include "swift/Basic/SourceLoc.h"
Expand Down Expand Up @@ -334,7 +335,8 @@ struct StableAvailabilityDomainComparator {
};

/// Represents an availability domain that has been defined in a module.
class CustomAvailabilityDomain : public llvm::FoldingSetNode {
class alignas(1 << CustomAvailabilityDomainAlignInBits) CustomAvailabilityDomain
: public llvm::FoldingSetNode {
public:
enum class Kind : uint8_t {
/// A domain that is known to be enabled at compile time.
Expand Down
5 changes: 5 additions & 0 deletions include/swift/AST/TypeAlignments.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace swift {
class AttributeBase;
class BraceStmt;
class CaptureListExpr;
class CustomAvailabilityDomain;
class Decl;
class DeclContext;
class DifferentiableAttr;
Expand Down Expand Up @@ -80,6 +81,7 @@ namespace swift {
constexpr size_t ASTContextAlignInBits = 2;
constexpr size_t TypeVariableAlignInBits = 4;
constexpr size_t StoredDefaultArgumentAlignInBits = 3;
constexpr size_t CustomAvailabilityDomainAlignInBits = 3;

// Well, this is the *minimum* pointer alignment; it's going to be 3 on
// 64-bit targets, but that doesn't matter.
Expand Down Expand Up @@ -165,6 +167,9 @@ LLVM_DECLARE_TYPE_ALIGNMENT(swift::CaseLabelItem, swift::PatternAlignInBits)
LLVM_DECLARE_TYPE_ALIGNMENT(swift::StmtConditionElement,
swift::PatternAlignInBits)

LLVM_DECLARE_TYPE_ALIGNMENT(swift::CustomAvailabilityDomain,
swift::CustomAvailabilityDomainAlignInBits)

static_assert(alignof(void*) >= 2, "pointer alignment is too small");

#endif