Skip to content

Commit c615faa

Browse files
committed
AST: Rename AvailabilityContext's storage member.
NFC.
1 parent 11fbd94 commit c615faa

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

include/swift/AST/AvailabilityContext.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ class AvailabilityContext {
4141
struct PlatformInfo;
4242

4343
/// A non-null pointer to uniqued storage for this availability context.
44-
const Storage *Info;
44+
const Storage *storage;
4545

46-
AvailabilityContext(const Storage *info) : Info(info) { assert(info); };
46+
AvailabilityContext(const Storage *storage) : storage(storage) {
47+
assert(storage);
48+
};
4749

4850
/// Retrieves an `AvailabilityContext` with the given platform availability
4951
/// parameters.
@@ -108,12 +110,12 @@ class AvailabilityContext {
108110

109111
friend bool operator==(const AvailabilityContext &lhs,
110112
const AvailabilityContext &rhs) {
111-
return lhs.Info == rhs.Info;
113+
return lhs.storage == rhs.storage;
112114
}
113115

114116
friend bool operator!=(const AvailabilityContext &lhs,
115117
const AvailabilityContext &rhs) {
116-
return lhs.Info != rhs.Info;
118+
return lhs.storage != rhs.storage;
117119
}
118120

119121
void print(llvm::raw_ostream &os) const;

include/swift/AST/AvailabilityContextStorage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct AvailabilityContext::PlatformInfo {
6969
/// As an implementation detail, the values that make up an `Availability`
7070
/// context are uniqued and stored as folding set nodes.
7171
class AvailabilityContext::Storage final : public llvm::FoldingSetNode {
72-
Storage(const PlatformInfo &platformInfo) : Platform(platformInfo){};
72+
Storage(const PlatformInfo &platformInfo) : Platform(platformInfo) {};
7373

7474
public:
7575
PlatformInfo Platform;

lib/AST/AvailabilityContext.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,29 +157,29 @@ AvailabilityContext::get(const AvailabilityRange &platformAvailability,
157157
}
158158

159159
AvailabilityRange AvailabilityContext::getPlatformRange() const {
160-
return Info->Platform.Range;
160+
return storage->Platform.Range;
161161
}
162162

163163
std::optional<PlatformKind>
164164
AvailabilityContext::getUnavailablePlatformKind() const {
165-
if (Info->Platform.IsUnavailable)
166-
return Info->Platform.UnavailablePlatform;
165+
if (storage->Platform.IsUnavailable)
166+
return storage->Platform.UnavailablePlatform;
167167
return std::nullopt;
168168
}
169169

170170
bool AvailabilityContext::isUnavailableInEmbedded() const {
171-
return Info->Platform.IsUnavailableInEmbedded;
171+
return storage->Platform.IsUnavailableInEmbedded;
172172
}
173173

174174
bool AvailabilityContext::isDeprecated() const {
175-
return Info->Platform.IsDeprecated;
175+
return storage->Platform.IsDeprecated;
176176
}
177177

178178
void AvailabilityContext::constrainWithContext(const AvailabilityContext &other,
179179
ASTContext &ctx) {
180-
PlatformInfo platformAvailability{Info->Platform};
181-
if (platformAvailability.constrainWith(other.Info->Platform)) {
182-
Info = Storage::get(platformAvailability, ctx);
180+
PlatformInfo platformAvailability{storage->Platform};
181+
if (platformAvailability.constrainWith(other.storage->Platform)) {
182+
storage = Storage::get(platformAvailability, ctx);
183183
}
184184
}
185185

@@ -189,28 +189,28 @@ void AvailabilityContext::constrainWithDecl(const Decl *decl) {
189189

190190
void AvailabilityContext::constrainWithPlatformRange(
191191
const AvailabilityRange &platformRange, ASTContext &ctx) {
192-
PlatformInfo platformAvailability{Info->Platform};
192+
PlatformInfo platformAvailability{storage->Platform};
193193
if (!constrainRange(platformAvailability.Range, platformRange))
194194
return;
195195

196-
Info = Storage::get(platformAvailability, ctx);
196+
storage = Storage::get(platformAvailability, ctx);
197197
}
198198

199199
void AvailabilityContext::constrainWithDeclAndPlatformRange(
200200
const Decl *decl, const AvailabilityRange &platformRange) {
201-
PlatformInfo platformAvailability{Info->Platform};
201+
PlatformInfo platformAvailability{storage->Platform};
202202
bool isConstrained = false;
203203
isConstrained |= platformAvailability.constrainWith(decl);
204204
isConstrained |= constrainRange(platformAvailability.Range, platformRange);
205205

206206
if (!isConstrained)
207207
return;
208208

209-
Info = Storage::get(platformAvailability, decl->getASTContext());
209+
storage = Storage::get(platformAvailability, decl->getASTContext());
210210
}
211211

212212
bool AvailabilityContext::isContainedIn(const AvailabilityContext other) const {
213-
if (!Info->Platform.isContainedIn(other.Info->Platform))
213+
if (!storage->Platform.isContainedIn(other.storage->Platform))
214214
return false;
215215

216216
return true;

0 commit comments

Comments
 (0)