Skip to content

AST: Use PointerIntPair in AvailabilityConstraint #78764

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
tshortli merged 1 commit into from
Jan 21, 2025
Merged

AST: Use PointerIntPair in AvailabilityConstraint #78764

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
11 changes: 6 additions & 5 deletions include/swift/AST/AvailabilityConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,10 @@ class AvailabilityConstraint {
};

private:
Kind kind;
SemanticAvailableAttr attr;
llvm::PointerIntPair<SemanticAvailableAttr, 2, Kind> attrAndKind;

AvailabilityConstraint(Kind kind, SemanticAvailableAttr attr)
: kind(kind), attr(attr) {};
: attrAndKind(attr, kind) {};

public:
static AvailabilityConstraint
Expand All @@ -84,8 +83,10 @@ class AvailabilityConstraint {
return AvailabilityConstraint(Kind::IntroducedInNewerVersion, attr);
}

Kind getKind() const { return kind; }
SemanticAvailableAttr getAttr() const { return attr; }
Kind getKind() const { return attrAndKind.getInt(); }
SemanticAvailableAttr getAttr() const {
return static_cast<SemanticAvailableAttr>(attrAndKind.getPointer());
}

/// Returns the platform that this constraint applies to, or
/// `PlatformKind::none` if it is not platform specific.
Expand Down
12 changes: 6 additions & 6 deletions lib/AST/Availability.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@ AvailabilityRange AvailabilityRange::forRuntimeTarget(const ASTContext &Ctx) {
}

PlatformKind AvailabilityConstraint::getPlatform() const {
return attr.getPlatform();
return getAttr().getPlatform();
}

std::optional<AvailabilityRange>
AvailabilityConstraint::getRequiredNewerAvailabilityRange(
ASTContext &ctx) const {
switch (kind) {
switch (getKind()) {
case Kind::AlwaysUnavailable:
case Kind::RequiresVersion:
case Kind::Obsoleted:
return std::nullopt;
case Kind::IntroducedInNewerVersion:
return attr.getIntroducedRange(ctx);
return getAttr().getIntroducedRange(ctx);
}
}

bool AvailabilityConstraint::isConditionallySatisfiable() const {
switch (kind) {
switch (getKind()) {
case Kind::AlwaysUnavailable:
case Kind::RequiresVersion:
case Kind::Obsoleted:
Expand All @@ -96,10 +96,10 @@ bool AvailabilityConstraint::isConditionallySatisfiable() const {
}

bool AvailabilityConstraint::isActiveForRuntimeQueries(ASTContext &ctx) const {
if (attr.getPlatform() == PlatformKind::none)
if (getAttr().getPlatform() == PlatformKind::none)
return true;

return swift::isPlatformActive(attr.getPlatform(), ctx.LangOpts,
return swift::isPlatformActive(getAttr().getPlatform(), ctx.LangOpts,
/*forTargetVariant=*/false,
/*forRuntimeQuery=*/true);
}
Expand Down