Skip to content

Commit 556a9b1

Browse files
tshortlitshortli
authored
Merge pull request #70730 from tshortli/potentially-unavailable-conformance-error-swift6
Sema: Error for potentially unavailable conformances in Swift 6
2 parents a1146ff + 41c4143 commit 556a9b1

File tree

9 files changed

+39
-66
lines changed

9 files changed

+39
-66
lines changed

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6714,10 +6714,6 @@ ERROR(conformance_availability_only_version_newer, none,
67146714
"conformance of %0 to %1 is only available in %2 %3 or newer",
67156715
(Type, Type, StringRef, llvm::VersionTuple))
67166716

6717-
WARNING(conformance_availability_only_version_newer_warn, none,
6718-
"conformance of %0 to %1 is only available in %2 %3 or newer",
6719-
(Type, Type, StringRef, llvm::VersionTuple))
6720-
67216717
//------------------------------------------------------------------------------
67226718
// MARK: @discardableResult
67236719
//------------------------------------------------------------------------------

‎include/swift/Basic/LangOptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,6 @@ namespace swift {
204204
/// declarations introduced at the deployment target.
205205
bool WeakLinkAtTarget = false;
206206

207-
/// Should conformance availability violations be diagnosed as errors?
208-
bool EnableConformanceAvailabilityErrors = false;
209-
210207
/// Should the editor placeholder error be downgraded to a warning?
211208
bool WarnOnEditorPlaceholder = false;
212209

‎include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,14 +664,6 @@ def disable_availability_checking : Flag<["-"],
664664
"disable-availability-checking">,
665665
HelpText<"Disable checking for potentially unavailable APIs">;
666666

667-
def enable_conformance_availability_errors : Flag<["-"],
668-
"enable-conformance-availability-errors">,
669-
HelpText<"Diagnose conformance availability violations as errors">;
670-
671-
def disable_conformance_availability_errors : Flag<["-"],
672-
"disable-conformance-availability-errors">,
673-
HelpText<"Diagnose conformance availability violations as warnings">;
674-
675667
def warn_on_potentially_unavailable_enum_case : Flag<["-"],
676668
"warn-on-potentially-unavailable-enum-case">,
677669
HelpText<"Deprecated, will be removed in future versions">;

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -677,12 +677,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
677677

678678
Opts.WeakLinkAtTarget |= Args.hasArg(OPT_weak_link_at_target);
679679

680-
if (auto A = Args.getLastArg(OPT_enable_conformance_availability_errors,
681-
OPT_disable_conformance_availability_errors)) {
682-
Opts.EnableConformanceAvailabilityErrors
683-
= A->getOption().matches(OPT_enable_conformance_availability_errors);
684-
}
685-
686680
Opts.WarnOnEditorPlaceholder |= Args.hasArg(OPT_warn_on_editor_placeholder);
687681

688682
if (auto A = Args.getLastArg(OPT_disable_typo_correction,

‎lib/Sema/ResilienceDiagnostics.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ TypeChecker::diagnoseConformanceExportability(SourceLoc loc,
347347
const RootProtocolConformance *rootConf,
348348
const ExtensionDecl *ext,
349349
const ExportContext &where,
350-
bool useConformanceAvailabilityErrorsOption) {
350+
bool warnIfConformanceUnavailablePreSwift6) {
351351
if (!where.mustOnlyReferenceExportedDecls())
352352
return false;
353353

@@ -390,8 +390,7 @@ TypeChecker::diagnoseConformanceExportability(SourceLoc loc,
390390
static_cast<unsigned>(*reason),
391391
M->getName(),
392392
static_cast<unsigned>(originKind))
393-
.warnUntilSwiftVersionIf((useConformanceAvailabilityErrorsOption &&
394-
!ctx.LangOpts.EnableConformanceAvailabilityErrors &&
393+
.warnUntilSwiftVersionIf((warnIfConformanceUnavailablePreSwift6 &&
395394
originKind != DisallowedOriginKind::SPIOnly &&
396395
originKind != DisallowedOriginKind::NonPublicImport) ||
397396
originKind == DisallowedOriginKind::MissingImport,

‎lib/Sema/TypeCheckAvailability.cpp

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,17 +2182,13 @@ void TypeChecker::diagnosePotentialUnavailability(
21822182
{
21832183
auto type = rootConf->getType();
21842184
auto proto = rootConf->getProtocol()->getDeclaredInterfaceType();
2185+
auto err = ctx.Diags.diagnose(
2186+
loc, diag::conformance_availability_only_version_newer, type, proto,
2187+
prettyPlatformString(targetPlatform(ctx.LangOpts)),
2188+
reason.getRequiredOSVersionRange().getLowerEndpoint());
21852189

2186-
auto diagID = (ctx.LangOpts.EnableConformanceAvailabilityErrors
2187-
? diag::conformance_availability_only_version_newer
2188-
: diag::conformance_availability_only_version_newer_warn);
2189-
auto behavior = behaviorLimitForExplicitUnavailability(rootConf, dc);
2190-
auto err =
2191-
ctx.Diags.diagnose(
2192-
loc, diagID,
2193-
type, proto, prettyPlatformString(targetPlatform(ctx.LangOpts)),
2194-
reason.getRequiredOSVersionRange().getLowerEndpoint());
2195-
err.limitBehavior(behavior);
2190+
err.warnUntilSwiftVersion(6);
2191+
err.limitBehavior(behaviorLimitForExplicitUnavailability(rootConf, dc));
21962192

21972193
// Direct a fixit to the error if an existing guard is nearly-correct
21982194
if (fixAvailabilityByNarrowingNearbyVersionCheck(loc, dc,
@@ -2816,7 +2812,7 @@ bool swift::diagnoseExplicitUnavailability(SourceLoc loc,
28162812
const RootProtocolConformance *rootConf,
28172813
const ExtensionDecl *ext,
28182814
const ExportContext &where,
2819-
bool useConformanceAvailabilityErrorsOption) {
2815+
bool warnIfConformanceUnavailablePreSwift6) {
28202816
auto *attr = AvailableAttr::isUnavailable(ext);
28212817
if (!attr)
28222818
return false;
@@ -2874,9 +2870,7 @@ bool swift::diagnoseExplicitUnavailability(SourceLoc loc,
28742870
type, proto,
28752871
platform.empty(), platform, EncodedMessage.Message)
28762872
.limitBehavior(behavior)
2877-
.warnUntilSwiftVersionIf(useConformanceAvailabilityErrorsOption &&
2878-
!ctx.LangOpts.EnableConformanceAvailabilityErrors,
2879-
6);
2873+
.warnUntilSwiftVersionIf(warnIfConformanceUnavailablePreSwift6, 6);
28802874

28812875
switch (attr->getVersionAvailability(ctx)) {
28822876
case AvailableVersionComparison::Available:
@@ -4006,7 +4000,7 @@ class ProblematicTypeFinder : public TypeDeclFinder {
40064000
Loc, subs, Where,
40074001
/*depTy=*/Type(),
40084002
/*replacementTy=*/Type(),
4009-
/*useConformanceAvailabilityErrorsOption=*/false,
4003+
/*warnIfConformanceUnavailablePreSwift6=*/false,
40104004
/*suppressParameterizationCheckForOptional=*/ty->isOptional());
40114005
return Action::Continue;
40124006
}
@@ -4085,7 +4079,7 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
40854079
ProtocolConformanceRef conformance,
40864080
const ExportContext &where,
40874081
Type depTy, Type replacementTy,
4088-
bool useConformanceAvailabilityErrorsOption) {
4082+
bool warnIfConformanceUnavailablePreSwift6) {
40894083
assert(!where.isImplicit());
40904084

40914085
if (conformance.isPack()) {
@@ -4094,7 +4088,7 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
40944088
for (auto patternConf : pack->getPatternConformances()) {
40954089
diagnosed |= diagnoseConformanceAvailability(
40964090
loc, patternConf, where, depTy, replacementTy,
4097-
useConformanceAvailabilityErrorsOption);
4091+
warnIfConformanceUnavailablePreSwift6);
40984092
}
40994093
return diagnosed;
41004094
}
@@ -4131,13 +4125,13 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
41314125

41324126
if (auto *ext = dyn_cast<ExtensionDecl>(rootConf->getDeclContext())) {
41334127
if (TypeChecker::diagnoseConformanceExportability(loc, rootConf, ext, where,
4134-
useConformanceAvailabilityErrorsOption)) {
4128+
warnIfConformanceUnavailablePreSwift6)) {
41354129
maybeEmitAssociatedTypeNote();
41364130
return true;
41374131
}
41384132

41394133
if (diagnoseExplicitUnavailability(loc, rootConf, ext, where,
4140-
useConformanceAvailabilityErrorsOption)) {
4134+
warnIfConformanceUnavailablePreSwift6)) {
41414135
maybeEmitAssociatedTypeNote();
41424136
return true;
41434137
}
@@ -4165,7 +4159,7 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
41654159
SubstitutionMap subConformanceSubs = concreteConf->getSubstitutionMap();
41664160
if (diagnoseSubstitutionMapAvailability(loc, subConformanceSubs, where,
41674161
depTy, replacementTy,
4168-
useConformanceAvailabilityErrorsOption))
4162+
warnIfConformanceUnavailablePreSwift6))
41694163
return true;
41704164

41714165
return false;
@@ -4176,13 +4170,13 @@ swift::diagnoseSubstitutionMapAvailability(SourceLoc loc,
41764170
SubstitutionMap subs,
41774171
const ExportContext &where,
41784172
Type depTy, Type replacementTy,
4179-
bool useConformanceAvailabilityErrorsOption,
4173+
bool warnIfConformanceUnavailablePreSwift6,
41804174
bool suppressParameterizationCheckForOptional) {
41814175
bool hadAnyIssues = false;
41824176
for (ProtocolConformanceRef conformance : subs.getConformances()) {
41834177
if (diagnoseConformanceAvailability(loc, conformance, where,
41844178
depTy, replacementTy,
4185-
useConformanceAvailabilityErrorsOption))
4179+
warnIfConformanceUnavailablePreSwift6))
41864180
hadAnyIssues = true;
41874181
}
41884182

‎lib/Sema/TypeCheckAvailability.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,15 @@ diagnoseConformanceAvailability(SourceLoc loc,
227227
const ExportContext &context,
228228
Type depTy=Type(),
229229
Type replacementTy=Type(),
230-
bool useConformanceAvailabilityErrorsOption = false);
230+
bool warnIfConformanceUnavailablePreSwift6 = false);
231231

232232
bool diagnoseSubstitutionMapAvailability(
233233
SourceLoc loc,
234234
SubstitutionMap subs,
235235
const ExportContext &context,
236236
Type depTy = Type(),
237237
Type replacementTy = Type(),
238-
bool useConformanceAvailabilityErrorsOption = false,
238+
bool warnIfConformanceUnavailablePreSwift6 = false,
239239
bool suppressParameterizationCheckForOptional = false);
240240

241241
/// Diagnose uses of unavailable declarations. Returns true if a diagnostic
@@ -273,7 +273,7 @@ bool diagnoseExplicitUnavailability(
273273
const RootProtocolConformance *rootConf,
274274
const ExtensionDecl *ext,
275275
const ExportContext &where,
276-
bool useConformanceAvailabilityErrorsOption = false);
276+
bool warnIfConformanceUnavailablePreSwift6 = false);
277277

278278
/// Diagnose uses of the runtime features of parameterized protools. Returns
279279
/// \c true if a diagnostic was emitted.

‎test/Sema/conformance_availability.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-conformance-availability-errors
1+
// RUN: %target-typecheck-verify-swift -swift-version 6
22

33
// REQUIRES: OS=macosx
4+
// REQUIRES: asserts
45

56
public protocol Horse {}
67
func takesHorse<T : Horse>(_: T) {}
@@ -245,9 +246,9 @@ public struct HasAvailableConformance1 {}
245246
extension HasAvailableConformance1 : Horse {}
246247

247248
// These availability violations are errors because this test passes the
248-
// -enable-conformance-availability-errors flag. See the other test case
249-
// in test/Sema/conformance_availability_warn.swift for the same example
250-
// but without this flag.
249+
// -swift-version 6.
250+
// See the other test case in test/Sema/conformance_availability_warn.swift for
251+
// the same example for -swift-version 5.
251252

252253
func passAvailableConformance1(x: HasAvailableConformance1) { // expected-note 6{{add @available attribute to enclosing global function}}
253254
takesHorse(x) // expected-error {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}

‎test/Sema/conformance_availability_warn.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@ public struct HasAvailableConformance1 {}
1919
@available(macOS 100, *)
2020
extension HasAvailableConformance1 : Horse {}
2121

22-
// These availability violations are warnings because this test does not
23-
// pass the -enable-conformance-availability-errors flag. See the other
24-
// test case in test/Sema/conformance_availability.swift for the same
25-
// example but with this flag.
22+
// These availability violations are warnings because this test does not pass
23+
// -swift-version 6.
24+
// See the other test case in test/Sema/conformance_availability.swift for the
25+
// same example but with -swift-version 6.
2626

2727
func passAvailableConformance1(x: HasAvailableConformance1) { // expected-note 6{{add @available attribute to enclosing global function}}
28-
takesHorse(x) // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
28+
takesHorse(x) // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
2929
// expected-note@-1 {{add 'if #available' version check}}
3030

31-
takesHorseExistential(x) // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
31+
takesHorseExistential(x) // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
3232
// expected-note@-1 {{add 'if #available' version check}}
3333

34-
x.giddyUp() // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
34+
x.giddyUp() // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
3535
// expected-note@-1 {{add 'if #available' version check}}
3636

37-
_ = x.isGalloping // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
37+
_ = x.isGalloping // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
3838
// expected-note@-1 {{add 'if #available' version check}}
3939

40-
_ = x[keyPath: \.isGalloping] // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
40+
_ = x[keyPath: \.isGalloping] // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
4141
// expected-note@-1 {{add 'if #available' version check}}
4242

43-
_ = UsesHorse<HasAvailableConformance1>.self // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer}}
43+
_ = UsesHorse<HasAvailableConformance1>.self // expected-warning {{conformance of 'HasAvailableConformance1' to 'Horse' is only available in macOS 100 or newer; this is an error in Swift 6}}
4444
// expected-note@-1 {{add 'if #available' version check}}
4545
}
4646

@@ -60,9 +60,9 @@ public struct HasAvailableConformance2 {}
6060
extension HasAvailableConformance2 : Horse {} // expected-note 6 {{conformance of 'HasAvailableConformance2' to 'Horse' has been explicitly marked unavailable here}}
6161

6262
// Some availability diagnostics become warnings in Swift 5 mode without
63-
// -enable-conformance-availability-errors because they were incorrectly
64-
// accepted before and rejecting them would break source compatibility. Others
65-
// are unaffected because they have always been rejected.
63+
// because they were incorrectly accepted before and rejecting them would break
64+
// source compatibility. Others are unaffected because they have always been
65+
// rejected.
6666

6767
func passAvailableConformance2(x: HasAvailableConformance2) {
6868
takesHorse(x) // expected-error {{conformance of 'HasAvailableConformance2' to 'Horse' is unavailable}}

0 commit comments

Comments
 (0)