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

Frontend: Downgrade 'already enabled' to a warning for experimental features.

Browse Source 
If an upcoming feature was enabled by passing it via `-enable-experimental-feature`,
downgrade the `already enabled` diagnostic to a warning.

Resolves rdar://139087679.
This commit is contained in:
Allan Shortlidge
2024-11-01 15:18:56 -07:00
parent 0c364a79a6
commit 2fa75bd0bd
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1015,13 +1015,16 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.EnableExperimentalStringProcessing = true;
}
auto enableUpcomingFeature = [&Opts, &Diags](Feature feature) -> bool {
auto enableUpcomingFeature = [&Opts, &Diags](Feature feature,
bool downgradeDiag) -> bool {
// Check if this feature was introduced already in this language version.
if (auto firstVersion = getFeatureLanguageVersion(feature)) {
if (Opts.isSwiftVersionAtLeast(*firstVersion)) {
Diags.diagnose(SourceLoc(), diag::error_upcoming_feature_on_by_default,
getFeatureName(feature), *firstVersion);
return true;
Diags
.diagnose(SourceLoc(), diag::error_upcoming_feature_on_by_default,
getFeatureName(feature), *firstVersion)
.limitBehaviorIf(downgradeDiag, DiagnosticBehavior::Warning);
return !downgradeDiag;
}
}
@@ -1062,7 +1065,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
// -enable-experimental-feature flag too since the feature may have
// graduated from being experimental.
if (auto feature = getUpcomingFeature(value)) {
if (enableUpcomingFeature(*feature))
if (enableUpcomingFeature(*feature, /*downgradeDiag=*/true))
HadError = true;
}
@@ -1087,7 +1090,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
if (!feature)
continue;
if (enableUpcomingFeature(*feature))
if (enableUpcomingFeature(*feature, /*downgradeDiag=*/false))
HadError = true;
}