Skip to content

Commit 67c5927

Browse files
committed
Frontend: Rename -dump-type-refinement-contexts to -dump-availability-scopes.
1 parent ce0c161 commit 67c5927

7 files changed

+11
-11
lines changed

include/swift/Option/Options.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,8 @@ def dump_scope_maps : Separate<["-"], "dump-scope-maps">,
13361336
MetaVarName<"<expanded-or-list-of-line:column>">,
13371337
ModeOpt,
13381338
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
1339-
def dump_type_refinement_contexts :
1340-
Flag<["-"], "dump-type-refinement-contexts">,
1339+
def dump_availability_scopes :
1340+
Flag<["-"], "dump-availability-scopes">,
13411341
HelpText<"Type-check input file(s) and dump availability scopes">,
13421342
ModeOpt,
13431343
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;

lib/Driver/Driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
12301230
case options::OPT_typecheck:
12311231
case options::OPT_dump_parse:
12321232
case options::OPT_print_ast:
1233-
case options::OPT_dump_type_refinement_contexts:
1233+
case options::OPT_dump_availability_scopes:
12341234
case options::OPT_dump_scope_maps:
12351235
case options::OPT_dump_interface_hash:
12361236
case options::OPT_dump_type_info:

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ ArgsToFrontendOptionsConverter::determineRequestedAction(const ArgList &args) {
575575
return FrontendOptions::ActionType::MergeModules;
576576
if (Opt.matches(OPT_dump_scope_maps))
577577
return FrontendOptions::ActionType::DumpScopeMaps;
578-
if (Opt.matches(OPT_dump_type_refinement_contexts))
578+
if (Opt.matches(OPT_dump_availability_scopes))
579579
return FrontendOptions::ActionType::DumpAvailabilityScopes;
580580
if (Opt.matches(OPT_dump_interface_hash))
581581
return FrontendOptions::ActionType::DumpInterfaceHash;

test/Sema/availability_and_delayed_parsing.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
/// skipping some function bodies. rdar://82269657
33

44
/// Default build mode reading everything
5-
// RUN: %target-swift-frontend -typecheck -dump-type-refinement-contexts %s -target %target-cpu-apple-macos10.10 2>&1 \
5+
// RUN: %target-swift-frontend -typecheck -dump-availability-scopes %s -target %target-cpu-apple-macos10.10 2>&1 \
66
// RUN: | %FileCheck %s --check-prefixes TRC-API,TRC-INLINABLE,TRC-WITHTYPES,TRC-FULL
77

88
/// Emit-module-separately mode / for LLDB
9-
// RUN: %target-swift-frontend -typecheck -dump-type-refinement-contexts %s -target %target-cpu-apple-macos10.10 -experimental-skip-non-inlinable-function-bodies-without-types 2>&1 \
9+
// RUN: %target-swift-frontend -typecheck -dump-availability-scopes %s -target %target-cpu-apple-macos10.10 -experimental-skip-non-inlinable-function-bodies-without-types 2>&1 \
1010
// RUN: | %FileCheck %s --check-prefixes TRC-API,TRC-INLINABLE,TRC-WITHTYPES,TRC-FULL-NOT
1111

1212
/// InstallAPI mode
13-
// RUN: %target-swift-frontend -typecheck -dump-type-refinement-contexts %s -target %target-cpu-apple-macos10.10 -experimental-skip-non-inlinable-function-bodies 2>&1 \
13+
// RUN: %target-swift-frontend -typecheck -dump-availability-scopes %s -target %target-cpu-apple-macos10.10 -experimental-skip-non-inlinable-function-bodies 2>&1 \
1414
// RUN: | %FileCheck %s --check-prefixes TRC-API,TRC-INLINABLE,TRC-WITHTYPES-NOT,TRC-FULL-NOT
1515

1616
/// Index build mode
17-
// RUN: %target-swift-frontend -typecheck -dump-type-refinement-contexts %s -target %target-cpu-apple-macos10.10 -experimental-skip-all-function-bodies 2>&1 \
17+
// RUN: %target-swift-frontend -typecheck -dump-availability-scopes %s -target %target-cpu-apple-macos10.10 -experimental-skip-all-function-bodies 2>&1 \
1818
// RUN: | %FileCheck %s --check-prefixes TRC-API,TRC-INLINABLE-NOT,TRC-WITHTYPES-NOT,TRC-FULL-NOT
1919

2020
// REQUIRES: OS=macosx

test/Sema/availability_scopes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -typecheck -dump-type-refinement-contexts %s -target %target-cpu-apple-macos50 > %t.dump 2>&1
1+
// RUN: %target-swift-frontend -typecheck -dump-availability-scopes %s -target %target-cpu-apple-macos50 > %t.dump 2>&1
22
// RUN: %FileCheck --strict-whitespace %s < %t.dump
33

44
// REQUIRES: OS=macosx

test/Sema/availability_scopes_target_min_inlining.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -target %target-next-stable-abi-triple -typecheck -dump-type-refinement-contexts -target-min-inlining-version min %s > %t.dump 2>&1
1+
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -target %target-next-stable-abi-triple -typecheck -dump-availability-scopes -target-min-inlining-version min %s > %t.dump 2>&1
22
// RUN: %FileCheck --strict-whitespace --check-prefix CHECK-%target-os %s < %t.dump
33

44
// REQUIRES: swift_stable_abi

test/Sema/availability_scopes_target_min_inlining_maccatalyst.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// currently there are no bots that run the tests with macCatalyst as the
44
// target OS.
55

6-
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -target %target-cpu-apple-ios14.4-macabi -typecheck -dump-type-refinement-contexts -target-min-inlining-version min %s > %t.dump 2>&1
6+
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -target %target-cpu-apple-ios14.4-macabi -typecheck -dump-availability-scopes -target-min-inlining-version min %s > %t.dump 2>&1
77
// RUN: %FileCheck --strict-whitespace %s < %t.dump
88

99
// REQUIRES: OS=macosx || OS=maccatalyst

0 commit comments

Comments
 (0)