Skip to content

Commit 866db54

Browse files
committed
Gardening: Use const consistently for ASTContext parameters.
1 parent dc3df46 commit 866db54

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

include/swift/AST/AvailabilityContext.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ class AvailabilityContext {
5252
/// Retrieves an `AvailabilityContext` constrained by the given platform
5353
/// availability range.
5454
static AvailabilityContext forPlatformRange(const AvailabilityRange &range,
55-
ASTContext &ctx);
55+
const ASTContext &ctx);
5656

5757
/// Retrieves the maximally available `AvailabilityContext` for the
5858
/// compilation. The platform availability range will be set to the minimum
5959
/// inlining target (which may just be the deployment target).
60-
static AvailabilityContext forInliningTarget(ASTContext &ctx);
60+
static AvailabilityContext forInliningTarget(const ASTContext &ctx);
6161

6262
/// Retrieves an `AvailabilityContext` with the platform availability range
6363
/// set to the deployment target.
64-
static AvailabilityContext forDeploymentTarget(ASTContext &ctx);
64+
static AvailabilityContext forDeploymentTarget(const ASTContext &ctx);
6565

6666
/// Returns the range of platform versions which may execute code in the
6767
/// availability context, starting at its introduction version.
@@ -77,16 +77,17 @@ class AvailabilityContext {
7777
bool isDeprecated() const;
7878

7979
/// Constrain with another `AvailabilityContext`.
80-
void constrainWithContext(const AvailabilityContext &other, ASTContext &ctx);
80+
void constrainWithContext(const AvailabilityContext &other,
81+
const ASTContext &ctx);
8182

8283
/// Constrain the platform availability range with `platformRange`.
8384
void constrainWithPlatformRange(const AvailabilityRange &platformRange,
84-
ASTContext &ctx);
85+
const ASTContext &ctx);
8586

8687
/// Constrain the context by adding \p domain to the set of unavailable
8788
/// domains.
8889
void constrainWithUnavailableDomain(AvailabilityDomain domain,
89-
ASTContext &ctx);
90+
const ASTContext &ctx);
9091

9192
/// Constrain with the availability attributes of `decl`.
9293
void constrainWithDecl(const Decl *decl);
@@ -114,7 +115,7 @@ class AvailabilityContext {
114115
SWIFT_DEBUG_DUMP;
115116

116117
/// Returns true if all internal invariants are satisfied.
117-
bool verify(ASTContext &ctx) const;
118+
bool verify(const ASTContext &ctx) const;
118119
};
119120

120121
} // end namespace swift

include/swift/AST/AvailabilityContextStorage.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class AvailabilityContext::Info {
4848
/// restrictive than the current values. Returns true if any field was
4949
/// updated.
5050
bool constrainWith(const DeclAvailabilityConstraints &constraints,
51-
ASTContext &ctx);
51+
const ASTContext &ctx);
5252

5353
bool constrainUnavailability(
5454
const llvm::SmallVectorImpl<AvailabilityDomain> &domains);
@@ -63,7 +63,7 @@ class AvailabilityContext::Info {
6363
void Profile(llvm::FoldingSetNodeID &ID) const;
6464

6565
/// Returns true if all internal invariants are satisfied.
66-
bool verify(ASTContext &ctx) const;
66+
bool verify(const ASTContext &ctx) const;
6767
};
6868

6969
/// As an implementation detail, the values that make up an `Availability`
@@ -74,7 +74,7 @@ class AvailabilityContext::Storage final : public llvm::FoldingSetNode {
7474
public:
7575
Info info;
7676

77-
static const Storage *get(const Info &info, ASTContext &ctx);
77+
static const Storage *get(const Info &info, const ASTContext &ctx);
7878

7979
void Profile(llvm::FoldingSetNodeID &ID) const { info.Profile(ID); }
8080
};

lib/AST/ASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5714,7 +5714,7 @@ SubstitutionMap::Storage *SubstitutionMap::Storage::get(
57145714
}
57155715

57165716
const AvailabilityContext::Storage *
5717-
AvailabilityContext::Storage::get(const Info &info, ASTContext &ctx) {
5717+
AvailabilityContext::Storage::get(const Info &info, const ASTContext &ctx) {
57185718
llvm::FoldingSetNodeID id;
57195719
info.Profile(id);
57205720

lib/AST/AvailabilityContext.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bool AvailabilityContext::Info::constrainWith(const Info &other) {
4848
}
4949

5050
bool AvailabilityContext::Info::constrainWith(
51-
const DeclAvailabilityConstraints &constraints, ASTContext &ctx) {
51+
const DeclAvailabilityConstraints &constraints, const ASTContext &ctx) {
5252
bool isConstrained = false;
5353

5454
for (auto constraint : constraints) {
@@ -155,7 +155,7 @@ void AvailabilityContext::Info::Profile(llvm::FoldingSetNodeID &ID) const {
155155
ID.AddBoolean(IsDeprecated);
156156
}
157157

158-
bool AvailabilityContext::Info::verify(ASTContext &ctx) const {
158+
bool AvailabilityContext::Info::verify(const ASTContext &ctx) const {
159159
// Unavailable domains must be sorted to ensure folding set node lookups yield
160160
// consistent results.
161161
if (!llvm::is_sorted(UnavailableDomains,
@@ -167,18 +167,20 @@ bool AvailabilityContext::Info::verify(ASTContext &ctx) const {
167167

168168
AvailabilityContext
169169
AvailabilityContext::forPlatformRange(const AvailabilityRange &range,
170-
ASTContext &ctx) {
170+
const ASTContext &ctx) {
171171
Info info{range, /*UnavailableDomains*/ {},
172172
/*IsDeprecated*/ false};
173173
return AvailabilityContext(Storage::get(info, ctx));
174174
}
175175

176-
AvailabilityContext AvailabilityContext::forInliningTarget(ASTContext &ctx) {
176+
AvailabilityContext
177+
AvailabilityContext::forInliningTarget(const ASTContext &ctx) {
177178
return AvailabilityContext::forPlatformRange(
178179
AvailabilityRange::forInliningTarget(ctx), ctx);
179180
}
180181

181-
AvailabilityContext AvailabilityContext::forDeploymentTarget(ASTContext &ctx) {
182+
AvailabilityContext
183+
AvailabilityContext::forDeploymentTarget(const ASTContext &ctx) {
182184
return AvailabilityContext::forPlatformRange(
183185
AvailabilityRange::forDeploymentTarget(ctx), ctx);
184186
}
@@ -205,7 +207,7 @@ bool AvailabilityContext::isDeprecated() const {
205207
}
206208

207209
void AvailabilityContext::constrainWithContext(const AvailabilityContext &other,
208-
ASTContext &ctx) {
210+
const ASTContext &ctx) {
209211
bool isConstrained = false;
210212

211213
Info info{storage->info};
@@ -218,7 +220,7 @@ void AvailabilityContext::constrainWithContext(const AvailabilityContext &other,
218220
}
219221

220222
void AvailabilityContext::constrainWithPlatformRange(
221-
const AvailabilityRange &platformRange, ASTContext &ctx) {
223+
const AvailabilityRange &platformRange, const ASTContext &ctx) {
222224

223225
Info info{storage->info};
224226
if (!constrainRange(info.Range, platformRange))
@@ -228,7 +230,7 @@ void AvailabilityContext::constrainWithPlatformRange(
228230
}
229231

230232
void AvailabilityContext::constrainWithUnavailableDomain(
231-
AvailabilityDomain domain, ASTContext &ctx) {
233+
AvailabilityDomain domain, const ASTContext &ctx) {
232234
Info info{storage->info};
233235
if (!info.constrainUnavailability(domain))
234236
return;
@@ -289,6 +291,6 @@ void AvailabilityContext::print(llvm::raw_ostream &os) const {
289291

290292
void AvailabilityContext::dump() const { print(llvm::errs()); }
291293

292-
bool AvailabilityContext::verify(ASTContext &ctx) const {
294+
bool AvailabilityContext::verify(const ASTContext &ctx) const {
293295
return storage->info.verify(ctx);
294296
}

0 commit comments

Comments
 (0)