averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Feature] Switch migration postfix from :adoption to :migrate

Browse Source 
(cherry picked from commit 1ba077d922)
This commit is contained in:
Pavel Yaskevich
2025-04-28 13:08:24 -07:00
parent 61c8e70c66
commit de6ef08d71
7 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Frontend/CompilerInvocation.cpp
View File

@@ -816,7 +816,7 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
continue;
}
// For all other features, the argument format is `<name>[:adoption]`.
// For all other features, the argument format is `<name>[:migrate]`.
StringRef featureName;
std::optional<StringRef> featureMode;
std::tie(featureName, featureMode) = argValue.rsplit(':');
@@ -875,7 +875,7 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
const auto isMigratable = feature->isMigratable();
// Diagnose an invalid mode.
StringRef validModeName = "adoption";
StringRef validModeName = "migrate";
if (*featureMode != validModeName) {
Diags.diagnose(SourceLoc(), diag::invalid_feature_mode, *featureMode,
featureName,

4
test/Concurrency/attr_execution/adoption_mode.swift
View File

@@ -1,5 +1,5 @@
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 5 -enable-upcoming-feature NonisolatedNonsendingByDefault:adoption
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault:adoption
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 5 -enable-upcoming-feature NonisolatedNonsendingByDefault:migrate
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault:migrate
// REQUIRES: swift_feature_NonisolatedNonsendingByDefault

32
test/Frontend/features/adoption_mode.swift
View File

@@ -4,29 +4,29 @@
// RUN: %target-swift-frontend -parse -swift-version 5 \
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid1 \
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid2 \
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid3 \
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid4 \
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid5 \
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid6 \
// RUN: -disable-upcoming-feature DynamicActorIsolation:adoption \
// RUN: -disable-upcoming-feature DynamicActorIsolation:migrate \
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid7 \
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid8 \
// RUN: -disable-experimental-feature DynamicActorIsolation:adoption \
// RUN: -disable-experimental-feature DynamicActorIsolation:migrate \
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-5
// RUN: %target-swift-frontend -parse -swift-version 6 \
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid1 \
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid2 \
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid3 \
// RUN: -disable-upcoming-feature DynamicActorIsolation:adoption \
// RUN: -disable-upcoming-feature DynamicActorIsolation:migrate \
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid4 \
// RUN: -disable-experimental-feature DynamicActorIsolation:adoption \
// RUN: -disable-experimental-feature DynamicActorIsolation:migrate \
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-6
// REQUIRES: swift_feature_DynamicActorIsolation
@@ -34,18 +34,18 @@
// CHECK-NOT: error:
// CHECK-SWIFT-5-NOT: warning:
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:invalid8' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:invalid7' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:invalid6' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:invalid5' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid4' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid3' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NOT: warning:

24
test/Frontend/features/adoption_mode_adoptable_feature.swift
View File

@@ -3,20 +3,20 @@
// RUN: %target-swift-frontend -parse -swift-version 6 \
// RUN: -enable-upcoming-feature ExistentialAny:invalid1 \
// RUN: -enable-upcoming-feature ExistentialAny:adoption \
// RUN: -enable-upcoming-feature ExistentialAny:migrate \
// RUN: -enable-experimental-feature ExistentialAny:invalid2 \
// RUN: -enable-experimental-feature ExistentialAny:adoption \
// RUN: -disable-upcoming-feature ExistentialAny:adoption \
// RUN: -disable-experimental-feature ExistentialAny:adoption \
// RUN: -enable-experimental-feature ExistentialAny:migrate \
// RUN: -disable-upcoming-feature ExistentialAny:migrate \
// RUN: -disable-experimental-feature ExistentialAny:migrate \
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-5
// RUN: %target-swift-frontend -parse -swift-version 7 \
// RUN: -enable-upcoming-feature ExistentialAny:invalid1 \
// RUN: -enable-upcoming-feature ExistentialAny:adoption \
// RUN: -enable-upcoming-feature ExistentialAny:migrate \
// RUN: -enable-experimental-feature ExistentialAny:invalid2 \
// RUN: -enable-experimental-feature ExistentialAny:adoption \
// RUN: -disable-upcoming-feature ExistentialAny:adoption \
// RUN: -disable-experimental-feature ExistentialAny:adoption \
// RUN: -enable-experimental-feature ExistentialAny:migrate \
// RUN: -disable-upcoming-feature ExistentialAny:migrate \
// RUN: -disable-experimental-feature ExistentialAny:migrate \
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-7
// REQUIRES: swift_feature_ExistentialAny
@@ -25,10 +25,10 @@
// CHECK-NOT: error:
// CHECK-SWIFT-5-NOT: warning:
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'ExistentialAny:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'ExistentialAny:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'ExistentialAny'; did you mean 'adoption'? [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'ExistentialAny'; did you mean 'adoption'? [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'ExistentialAny:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'ExistentialAny:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'ExistentialAny'; did you mean 'migrate'? [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'ExistentialAny'; did you mean 'migrate'? [#StrictLanguageFeatures]{{$}}
// CHECK-SWIFT-5-NOT: warning:
// CHECK-SWIFT-7-NOT: warning:

2
test/type/explicit_existential.swift
View File

@@ -8,7 +8,7 @@
// RUN: -verify-additional-prefix default-swift-mode- \
// RUN: -verify-additional-prefix explicit-any-
// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny:adoption \
// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny:migrate \
// To verify that the message is not followed by
// "; this will be an error ...".
// RUN: -verify-additional-prefix default-swift-mode- \

74
unittests/Frontend/IsFeatureEnabledTests.cpp
View File

@@ -119,7 +119,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-upcoming-feature", baselineF.name + ":undef"},
{{baselineF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase(
{"-enable-upcoming-feature", baselineF.name + ":adoption"},
{"-enable-upcoming-feature", baselineF.name + ":migrate"},
{{baselineF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", baselineF.name},
@@ -128,7 +128,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-experimental-feature", baselineF.name + ":undef"},
{{baselineF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", baselineF.name + ":adoption"},
{"-enable-experimental-feature", baselineF.name + ":migrate"},
{{baselineF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase(
@@ -138,7 +138,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-upcoming-feature", upcomingF.name + ":undef"},
{{upcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-upcoming-feature", upcomingF.name + ":adoption"},
{"-enable-upcoming-feature", upcomingF.name + ":migrate"},
{{upcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", upcomingF.name},
@@ -147,7 +147,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-experimental-feature", upcomingF.name + ":undef"},
{{upcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", upcomingF.name + ":adoption"},
{"-enable-experimental-feature", upcomingF.name + ":migrate"},
{{upcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
@@ -157,14 +157,14 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-upcoming-feature", adoptableUpcomingF.name + ":undef"},
{{adoptableUpcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption"},
{"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate"},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
// Swift 7 is asserts-only.
#ifndef NDEBUG
// Requesting adoption mode in target language mode has no effect.
// Requesting migration mode in target language mode has no effect.
IsFeatureEnabledTestCase({
"-swift-version", adoptableUpcomingF.langMode,
"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption",
"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
#endif
@@ -175,14 +175,14 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-experimental-feature", adoptableUpcomingF.name + ":undef"},
{{adoptableUpcomingF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption"},
{"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate"},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
// Swift 7 is asserts-only.
#ifndef NDEBUG
// Requesting adoption mode in target language mode has no effect.
// Requesting migration mode in target language mode has no effect.
IsFeatureEnabledTestCase({
"-swift-version", adoptableUpcomingF.langMode,
"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption",
"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
#endif
@@ -193,7 +193,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-upcoming-feature", strictConcurrencyF.name + ":undef"},
{{strictConcurrencyF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-upcoming-feature", strictConcurrencyF.name + ":adoption"},
{"-enable-upcoming-feature", strictConcurrencyF.name + ":migrate"},
{{strictConcurrencyF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", strictConcurrencyF.name},
@@ -202,7 +202,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-experimental-feature", strictConcurrencyF.name + ":undef"},
{{strictConcurrencyF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", strictConcurrencyF.name + ":adoption"},
{"-enable-experimental-feature", strictConcurrencyF.name + ":migrate"},
{{strictConcurrencyF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
@@ -212,7 +212,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-upcoming-feature", experimentalF.name + ":undef"},
{{experimentalF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-upcoming-feature", experimentalF.name + ":adoption"},
{"-enable-upcoming-feature", experimentalF.name + ":migrate"},
{{experimentalF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", experimentalF.name},
@@ -221,7 +221,7 @@ static const IsFeatureEnabledTestCase singleEnableTestCases[] = {
{"-enable-experimental-feature", experimentalF.name + ":undef"},
{{experimentalF, FeatureState::Off}}),
IsFeatureEnabledTestCase(
{"-enable-experimental-feature", experimentalF.name + ":adoption"},
{"-enable-experimental-feature", experimentalF.name + ":migrate"},
{{experimentalF, FeatureState::Off}}),
};
// clang-format on
@@ -300,7 +300,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name + ":adoption",
"-enable-upcoming-feature", upcomingF.name + ":migrate",
"-enable-upcoming-feature", upcomingF.name,
},
{{upcomingF, FeatureState::Enabled}}),
@@ -311,7 +311,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name,
"-enable-upcoming-feature", upcomingF.name + ":adoption",
"-enable-upcoming-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -320,7 +320,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name + ":adoption",
"-enable-upcoming-feature", upcomingF.name + ":migrate",
"-enable-experimental-feature", upcomingF.name,
},
{{upcomingF, FeatureState::Enabled}}),
@@ -331,7 +331,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name,
"-enable-experimental-feature", upcomingF.name + ":adoption",
"-enable-experimental-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -340,7 +340,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name + ":adoption",
"-enable-experimental-feature", upcomingF.name + ":migrate",
"-enable-upcoming-feature", upcomingF.name,
},
{{upcomingF, FeatureState::Enabled}}),
@@ -351,7 +351,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name,
"-enable-upcoming-feature", upcomingF.name + ":adoption",
"-enable-upcoming-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -360,7 +360,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name + ":adoption",
"-enable-experimental-feature", upcomingF.name + ":migrate",
"-enable-experimental-feature", upcomingF.name,
},
{{upcomingF, FeatureState::Enabled}}),
@@ -371,7 +371,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name,
"-enable-experimental-feature", upcomingF.name + ":adoption",
"-enable-experimental-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
@@ -383,7 +383,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption",
"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate",
"-enable-upcoming-feature", adoptableUpcomingF.name,
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
@@ -394,7 +394,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", adoptableUpcomingF.name,
"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption",
"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
IsFeatureEnabledTestCase({
@@ -403,7 +403,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption",
"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate",
"-enable-experimental-feature", adoptableUpcomingF.name,
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
@@ -414,7 +414,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", adoptableUpcomingF.name,
"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption",
"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
IsFeatureEnabledTestCase({
@@ -423,7 +423,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption",
"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate",
"-enable-upcoming-feature", adoptableUpcomingF.name,
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
@@ -434,7 +434,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", adoptableUpcomingF.name,
"-enable-upcoming-feature", adoptableUpcomingF.name + ":adoption",
"-enable-upcoming-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
IsFeatureEnabledTestCase({
@@ -443,7 +443,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption",
"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate",
"-enable-experimental-feature", adoptableUpcomingF.name,
},
{{adoptableUpcomingF, FeatureState::Enabled}}),
@@ -454,7 +454,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{adoptableUpcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", adoptableUpcomingF.name,
"-enable-experimental-feature", adoptableUpcomingF.name + ":adoption",
"-enable-experimental-feature", adoptableUpcomingF.name + ":migrate",
},
{{adoptableUpcomingF, FeatureState::EnabledForMigration}}),
@@ -466,7 +466,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
},
{{experimentalF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", experimentalF.name + ":adoption",
"-enable-experimental-feature", experimentalF.name + ":migrate",
"-enable-experimental-feature", experimentalF.name,
},
{{experimentalF, FeatureState::Enabled}}),
@@ -477,7 +477,7 @@ static const IsFeatureEnabledTestCase doubleEnableTestCases[] = {
{{experimentalF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", experimentalF.name,
"-enable-experimental-feature", experimentalF.name + ":adoption",
"-enable-experimental-feature", experimentalF.name + ":migrate",
},
{{experimentalF, FeatureState::Enabled}}),
};
@@ -501,7 +501,7 @@ static const IsFeatureEnabledTestCase enableDisableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name,
"-disable-upcoming-feature", upcomingF.name + ":adoption",
"-disable-upcoming-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -521,7 +521,7 @@ static const IsFeatureEnabledTestCase enableDisableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name,
"-disable-upcoming-feature", upcomingF.name + ":adoption",
"-disable-upcoming-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -541,7 +541,7 @@ static const IsFeatureEnabledTestCase enableDisableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-upcoming-feature", upcomingF.name,
"-disable-experimental-feature", upcomingF.name + ":adoption",
"-disable-experimental-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -561,7 +561,7 @@ static const IsFeatureEnabledTestCase enableDisableTestCases[] = {
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", upcomingF.name,
"-disable-experimental-feature", upcomingF.name + ":adoption",
"-disable-experimental-feature", upcomingF.name + ":migrate",
},
{{upcomingF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
@@ -581,7 +581,7 @@ static const IsFeatureEnabledTestCase enableDisableTestCases[] = {
{{experimentalF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({
"-enable-experimental-feature", experimentalF.name,
"-disable-experimental-feature", experimentalF.name + ":adoption",
"-disable-experimental-feature", experimentalF.name + ":migrate",
},
{{experimentalF, FeatureState::Enabled}}),
IsFeatureEnabledTestCase({

8
unittests/Frontend/StrictConcurrencyTests.cpp
View File

@@ -42,13 +42,13 @@ static const StrictConcurrencyTestCase strictConcurrencyTestCases[] = {
{"-enable-upcoming-feature", strictConcurrencyF.name},
StrictConcurrency::Complete),
StrictConcurrencyTestCase(
{"-enable-upcoming-feature", strictConcurrencyF.name + ":adoption"},
{"-enable-upcoming-feature", strictConcurrencyF.name + ":migrate"},
StrictConcurrency::Minimal),
StrictConcurrencyTestCase(
{"-enable-experimental-feature", strictConcurrencyF.name},
StrictConcurrency::Complete),
StrictConcurrencyTestCase(
{"-enable-experimental-feature", strictConcurrencyF.name + ":adoption"},
{"-enable-experimental-feature", strictConcurrencyF.name + ":migrate"},
StrictConcurrency::Minimal),
StrictConcurrencyTestCase(
{"-disable-upcoming-feature", strictConcurrencyF.name},
@@ -73,7 +73,7 @@ static const StrictConcurrencyTestCase strictConcurrencyTestCases[] = {
StrictConcurrency::Targeted),
StrictConcurrencyTestCase({
"-enable-upcoming-feature",
strictConcurrencyF.name + "=targeted:adoption",
strictConcurrencyF.name + "=targeted:migrate",
},
StrictConcurrency::Minimal),
StrictConcurrencyTestCase(
@@ -81,7 +81,7 @@ static const StrictConcurrencyTestCase strictConcurrencyTestCases[] = {
StrictConcurrency::Targeted),
StrictConcurrencyTestCase({
"-enable-experimental-feature",
strictConcurrencyF.name + "=targeted:adoption",
strictConcurrencyF.name + "=targeted:migrate",
},
StrictConcurrency::Minimal),
StrictConcurrencyTestCase(