Skip to content

Commit 6bf0e62

Browse files
committed
AST: Rename AvailabilityContext::getDefault() to forInliningTarget().
Mirrors the factory methods on `AvailabilityRange`.
1 parent 98ff144 commit 6bf0e62

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

include/swift/AST/AvailabilityContext.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class AvailabilityContext {
5252
ASTContext &ctx);
5353

5454
public:
55-
/// Retrieves the default `AvailabilityContext`, which is maximally available.
56-
/// The platform availability range will be set to the deployment target (or
57-
/// minimum inlining target when applicable).
58-
static AvailabilityContext getDefault(ASTContext &ctx);
55+
/// Retrieves the maximally available `AvailabilityContext` for the
56+
/// compilation. The platform availability range will be set to the minimum
57+
/// inlining target (which may just be the deployment target).
58+
static AvailabilityContext forInliningTarget(ASTContext &ctx);
5959

6060
/// Returns the range of platform versions which may execute code in the
6161
/// availability context, starting at its introduction version.

lib/AST/AvailabilityContext.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void AvailabilityContext::Storage::Profile(llvm::FoldingSetNodeID &id) const {
124124
Platform.Profile(id);
125125
}
126126

127-
AvailabilityContext AvailabilityContext::getDefault(ASTContext &ctx) {
127+
AvailabilityContext AvailabilityContext::forInliningTarget(ASTContext &ctx) {
128128
PlatformInfo platformInfo{AvailabilityRange::forInliningTarget(ctx),
129129
PlatformKind::none,
130130
/*IsUnavailable*/ false,

lib/Sema/DerivedConformanceRawRepresentable.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
#include "CodeSynthesis.h"
19+
#include "DerivedConformances.h"
20+
#include "TypeCheckAvailability.h"
21+
#include "TypeCheckDecl.h"
1922
#include "TypeChecker.h"
2023
#include "swift/AST/Decl.h"
21-
#include "swift/AST/Stmt.h"
2224
#include "swift/AST/Expr.h"
23-
#include "swift/AST/Pattern.h"
2425
#include "swift/AST/ParameterList.h"
26+
#include "swift/AST/Pattern.h"
27+
#include "swift/AST/Stmt.h"
2528
#include "swift/AST/Types.h"
2629
#include "swift/Basic/Assertions.h"
2730
#include "llvm/ADT/APInt.h"
28-
#include "DerivedConformances.h"
29-
#include "TypeCheckDecl.h"
3031

3132
using namespace swift;
3233

lib/Sema/TypeCheckAvailability.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ void TypeChecker::buildAvailabilityScopes(SourceFile &SF) {
14281428
// The root availability scope reflects the fact that all parts of
14291429
// the source file are guaranteed to be executing on at least the minimum
14301430
// platform version for inlining.
1431-
auto AvailabilityContext = AvailabilityContext::getDefault(Context);
1431+
auto AvailabilityContext = AvailabilityContext::forInliningTarget(Context);
14321432
AvailabilityScope *RootScope =
14331433
AvailabilityScope::createForSourceFile(&SF, AvailabilityContext);
14341434
SF.setAvailabilityScope(RootScope);
@@ -1493,7 +1493,7 @@ TypeChecker::availabilityAtLocation(SourceLoc loc, const DeclContext *DC,
14931493
// this will be a real problem.
14941494

14951495
// We can assume we are running on at least the minimum inlining target.
1496-
auto baseAvailability = AvailabilityContext::getDefault(Context);
1496+
auto baseAvailability = AvailabilityContext::forInliningTarget(Context);
14971497
auto isInvalidLoc = [SF](SourceLoc loc) {
14981498
return SF ? loc.isInvalid() : true;
14991499
};

0 commit comments

Comments
 (0)