Skip to content

Commit 93ba352

Browse files
swift-ciswift-ci
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents c1bb2a4 + 9ba500d commit 93ba352

32 files changed

+175
-160
lines changed

Diff for: ‎include/swift/AST/DiagnosticsSema.def

-3
Original file line numberDiff line numberDiff line change
@@ -2356,9 +2356,6 @@ ERROR(spi_only_imports_not_enabled, none,
23562356
())
23572357

23582358
// Access level on imports
2359-
ERROR(access_level_on_import_not_enabled, none,
2360-
"Access level on imports require '-enable-experimental-feature AccessLevelOnImport'",
2361-
())
23622359
ERROR(access_level_on_import_unsupported, none,
23632360
"The access level %0 is unsupported on imports: "
23642361
"only 'public', 'package', 'internal', 'fileprivate' and 'private' "

Diff for: ‎include/swift/Basic/Features.def

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
117117
UPCOMING_FEATURE(ExistentialAny, 335, 6)
118118
UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
119119
UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
120+
UPCOMING_FEATURE(InternalImportsByDefault, 409, 6)
120121

121122
EXPERIMENTAL_FEATURE(StaticAssert, false)
122123
EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)

Diff for: ‎lib/AST/ASTPrinter.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -3436,6 +3436,10 @@ static bool usesFeatureDisableOutwardActorInference(Decl *decl) {
34363436
return false;
34373437
}
34383438

3439+
static bool usesFeatureInternalImportsByDefault(Decl *decl) {
3440+
return false;
3441+
}
3442+
34393443
static bool usesFeatureImportSymbolicCXXDecls(Decl *decl) { return false; }
34403444

34413445
static bool usesFeatureGenerateBindingsForThrowingFunctionsInCXX(Decl *decl) {

Diff for: ‎lib/AST/Decl.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1506,9 +1506,8 @@ AccessLevel ImportDecl::getAccessLevel() const {
15061506
}
15071507

15081508
auto &LangOpts = getASTContext().LangOpts;
1509-
if (LangOpts.isSwiftVersionAtLeast(6) &&
1510-
LangOpts.hasFeature(Feature::AccessLevelOnImport)) {
1511-
// Tentative Swift 6 mode where the default import is internal.
1509+
if (LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
1510+
// Swift 6 mode where the default import is internal.
15121511
return AccessLevel::Internal;
15131512
} else {
15141513
return AccessLevel::Public;

Diff for: ‎lib/Frontend/ModuleInterfaceSupport.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ static void printImports(raw_ostream &out,
233233
ModuleDecl *M,
234234
const llvm::SmallSet<StringRef, 4>
235235
&AliasModuleNamesTargets) {
236+
auto &ctx = M->getASTContext();
236237
// FIXME: This is very similar to what's in Serializer::writeInputBlock, but
237238
// it's not obvious what higher-level optimization would be factored out here.
238239
ModuleDecl::ImportFilter allImportFilter = {
@@ -290,7 +291,7 @@ static void printImports(raw_ostream &out,
290291
M->getMissingImportedModules(allImports);
291292

292293
ImportedModule::removeDuplicates(allImports);
293-
diagnoseScopedImports(M->getASTContext().Diags, allImports);
294+
diagnoseScopedImports(ctx.Diags, allImports);
294295

295296
// Collect the public imports as a subset so that we can mark them with
296297
// '@_exported'.
@@ -310,7 +311,7 @@ static void printImports(raw_ostream &out,
310311
// 'import Builtin' in the interface. '-parse-stdlib' still implicitly
311312
// imports it however...
312313
if (importedModule->isBuiltinModule() &&
313-
!M->getASTContext().LangOpts.hasFeature(Feature::BuiltinModule)) {
314+
!ctx.LangOpts.hasFeature(Feature::BuiltinModule)) {
314315
continue;
315316
}
316317

@@ -348,7 +349,7 @@ static void printImports(raw_ostream &out,
348349
out << "@_spi(" << spiName << ") ";
349350
}
350351

351-
if (M->getASTContext().LangOpts.isSwiftVersionAtLeast(6)) {
352+
if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
352353
out << "public ";
353354
}
354355

Diff for: ‎lib/Sema/ImportResolution.cpp

+10-3
Original file line numberDiff line numberDiff line change
@@ -821,14 +821,21 @@ void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
821821
topLevelModule.get()->getName(),
822822
SF.getParentModule()->getName());
823823

824-
if (ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport)) {
824+
if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
825+
// This will catch Swift 6 language mode as well where
826+
// it will be reported as an error.
827+
inFlight.fixItRemove(import.accessLevelRange);
828+
} else {
825829
SourceRange attrRange = import.accessLevelRange;
826830
if (attrRange.isValid())
827831
inFlight.fixItReplace(attrRange, "internal");
828832
else
829833
inFlight.fixItInsert(import.importLoc, "internal ");
830-
} else {
831-
inFlight.limitBehavior(DiagnosticBehavior::Warning);
834+
835+
// Downgrade to warning only in pre-Swift 6 mode and
836+
// when not using the experimental flag.
837+
if (!ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport))
838+
inFlight.limitBehavior(DiagnosticBehavior::Warning);
832839
}
833840
}
834841

Diff for: ‎lib/Sema/TypeCheckAccess.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,7 @@ void swift::diagnoseUnnecessaryPublicImports(SourceFile &SF) {
24522452

24532453
if (levelUsed == AccessLevel::Package) {
24542454
inFlight.fixItReplace(import.accessLevelRange, "package");
2455-
} else if (ctx.isSwiftVersionAtLeast(6)) {
2455+
} else if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
24562456
// Let it default to internal.
24572457
inFlight.fixItRemove(import.accessLevelRange);
24582458
} else {

Diff for: ‎lib/Sema/TypeCheckAttr.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,6 @@ bool AttributeChecker::visitAbstractAccessControlAttr(
998998

999999
SourceFile *File = D->getDeclContext()->getParentSourceFile();
10001000
if (auto importDecl = dyn_cast<ImportDecl>(D)) {
1001-
if (!D->getASTContext().LangOpts.hasFeature(Feature::AccessLevelOnImport) &&
1002-
File && File->Kind != SourceFileKind::Interface) {
1003-
diagnoseAndRemoveAttr(attr, diag::access_level_on_import_not_enabled);
1004-
return true;
1005-
}
1006-
10071001
if (attr->getAccess() == AccessLevel::Open) {
10081002
diagnoseAndRemoveAttr(attr, diag::access_level_on_import_unsupported,
10091003
attr);

Diff for: ‎lib/Sema/TypeChecker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ TypeCheckSourceFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
310310
CheckInconsistentSPIOnlyImportsRequest{SF},
311311
{});
312312

313-
if (!Ctx.LangOpts.isSwiftVersionAtLeast(6)) {
313+
if (!Ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
314314
evaluateOrDefault(
315315
Ctx.evaluator,
316316
CheckInconsistentAccessLevelOnImport{SF},

Diff for: ‎test/ModuleInterface/access-level-import-swiftinterfaces.swift

+40-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// Check that only public imports are printed in modules interfaces,
22
/// package imports and below are not.
3+
// REQUIRES: asserts
34

45
// RUN: %empty-directory(%t)
56
// RUN: split-file %s %t
@@ -21,30 +22,57 @@
2122
// RUN: -package-name TestPackage \
2223
// RUN: -enable-library-evolution -swift-version 5 \
2324
// RUN: -emit-module-interface-path %t/Client.swiftinterface \
24-
// RUN: -emit-private-module-interface-path %t/Client.private.swiftinterface \
25-
// RUN: -enable-experimental-feature AccessLevelOnImport
25+
// RUN: -emit-private-module-interface-path %t/Client.private.swiftinterface
2626

2727
// RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t
2828
// RUN: %target-swift-typecheck-module-from-interface(%t/Client.private.swiftinterface) -I %t \
2929
// RUN: -module-name Client
3030

31-
// RUN: %FileCheck %s < %t/Client.swiftinterface
32-
// RUN: %FileCheck %s < %t/Client.private.swiftinterface
31+
// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/Client.swiftinterface
32+
// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/Client.private.swiftinterface
3333

3434
/// Build a client composed of many files.
3535
// RUN: %target-swift-frontend -typecheck %t/MultiFiles?.swift -I %t \
3636
// RUN: -package-name TestPackage \
3737
// RUN: -enable-library-evolution -swift-version 5 \
3838
// RUN: -emit-module-interface-path %t/MultiFiles.swiftinterface \
39-
// RUN: -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface \
40-
// RUN: -enable-experimental-feature AccessLevelOnImport
39+
// RUN: -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface
4140

4241
// RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.swiftinterface) -I %t
4342
// RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.private.swiftinterface) -I %t \
4443
// RUN: -module-name MultiFiles
4544

46-
// RUN: %FileCheck %s < %t/MultiFiles.swiftinterface
47-
// RUN: %FileCheck %s < %t/MultiFiles.private.swiftinterface
45+
// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/MultiFiles.swiftinterface
46+
// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/MultiFiles.private.swiftinterface
47+
48+
/// Swift 6 mode.
49+
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
50+
// RUN: -package-name TestPackage -module-name Client_Swift6 \
51+
// RUN: -enable-library-evolution -swift-version 6 \
52+
// RUN: -emit-module-interface-path %t/Client_Swift6.swiftinterface \
53+
// RUN: -emit-private-module-interface-path %t/Client_Swift6.private.swiftinterface
54+
55+
// RUN: %target-swift-typecheck-module-from-interface(%t/Client_Swift6.swiftinterface) -I %t
56+
// RUN: %target-swift-typecheck-module-from-interface(%t/Client_Swift6.private.swiftinterface) -I %t \
57+
// RUN: -module-name Client_Swift6
58+
59+
// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6 < %t/Client_Swift6.swiftinterface
60+
// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6 < %t/Client_Swift6.private.swiftinterface
61+
62+
/// Feature flag.
63+
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
64+
// RUN: -package-name TestPackage -module-name Client_FeatureFlag \
65+
// RUN: -enable-library-evolution -swift-version 5 \
66+
// RUN: -emit-module-interface-path %t/Client_FeatureFlag.swiftinterface \
67+
// RUN: -emit-private-module-interface-path %t/Client_FeatureFlag.private.swiftinterface \
68+
// RUN: -enable-upcoming-feature InternalImportsByDefault
69+
70+
// RUN: %target-swift-typecheck-module-from-interface(%t/Client_FeatureFlag.swiftinterface) -I %t
71+
// RUN: %target-swift-typecheck-module-from-interface(%t/Client_FeatureFlag.private.swiftinterface) -I %t \
72+
// RUN: -module-name Client_FeatureFlag
73+
74+
// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-FLAG < %t/Client_FeatureFlag.swiftinterface
75+
// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-FLAG < %t/Client_FeatureFlag.private.swiftinterface
4876

4977
//--- PublicLib.swift
5078
//--- PackageLib.swift
@@ -53,6 +81,10 @@
5381
//--- PrivateLib.swift
5482

5583
//--- Client.swift
84+
// CHECK-5-NOT: public
85+
// CHECK-FLAG: -enable-upcoming-feature InternalImportsByDefault
86+
// CHECK-6: public
87+
5688
public import PublicLib
5789
// CHECK: PublicLib
5890

Diff for: ‎test/ModuleInterface/imports-swift6.swift

+34-11
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,47 @@
33
// REQUIRES: asserts
44

55
// RUN: %empty-directory(%t)
6-
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/empty.swiftmodule %S/../Inputs/empty.swift
7-
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/emptyButWithLibraryEvolution.swiftmodule %S/../Inputs/empty.swift -enable-library-evolution
6+
// RUN: split-file --leading-lines %s %t
7+
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/nonResilient.swiftmodule %t/empty.swift
8+
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/resilient.swiftmodule %t/empty.swift -enable-library-evolution
89

9-
/// Swift 6 variant.
10-
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s %S/Inputs/imports-other.swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %S/Inputs/imports-clang-modules/ -I %t -verify -swift-version 6
10+
/// Check errors.
11+
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/clientWithError.swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %t -verify -swift-version 6
12+
13+
/// Check Swift 6 imports printed in swiftinterface from 2 source files.
14+
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/main.swift %t/main-other.swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %S/Inputs/imports-clang-modules/ -I %t -verify -swift-version 6
1115
// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -I %S/Inputs/imports-clang-modules/ -I %t
1216
// RUN: %FileCheck -implicit-check-not BAD -check-prefix CHECK-6 %s < %t.swiftinterface
1317

14-
@_exported import empty // expected-warning {{module 'empty' was not compiled with library evolution support; using it means binary compatibility for 'main' can't be guaranteed}}
15-
@_exported import emptyButWithLibraryEvolution
16-
import B.B2
17-
import func C.c // expected-warning {{scoped imports are not yet supported in module interfaces}}
18+
//--- empty.swift
19+
20+
//--- main.swift
21+
@_exported public import resilient // expected-warning {{public import of 'resilient' was not used in public declarations or inlinable code}}
22+
public import B.B2 // expected-warning {{public import of 'B2' was not used in public declarations or inlinable code}}
23+
// expected-warning @-1 {{public import of 'B' was not used in public declarations or inlinable code}}
24+
// FIXME: We don't want this last warning.
25+
26+
public import func C.c // expected-warning {{public import of 'C' was not used in public declarations or inlinable code}}
27+
// expected-warning @-1 {{scoped imports are not yet supported in module interfaces}}
1828
import D
1929
@_implementationOnly import Secret_BAD
2030

2131
@_implementationOnly import NotSoSecret // expected-note {{imported as implementation-only here}}
22-
import NotSoSecret2 // expected-warning {{'NotSoSecret2' inconsistently imported as implementation-only}}
32+
public import NotSoSecret2 // expected-warning {{'NotSoSecret2' inconsistently imported as implementation-only}}
33+
// expected-warning @-1 {{public import of 'NotSoSecret2' was not used in public declarations or inlinable code}}
34+
35+
//--- main-other.swift
36+
public import A // expected-warning {{public import of 'A' was not used in public declarations or inlinable code}}
37+
public import B.B3 // expected-warning {{public import of 'B3' was not used in public declarations or inlinable code}}
38+
// expected-warning @-1 {{public import of 'B' was not used in public declarations or inlinable code}}
39+
public import D // expected-warning {{public import of 'D' was not used in public declarations or inlinable code}}
40+
41+
public import NotSoSecret // expected-warning {{'NotSoSecret' inconsistently imported as implementation-only}}
42+
// expected-warning @-1 {{public import of 'NotSoSecret' was not used in public declarations or inlinable code}}
43+
@_implementationOnly import NotSoSecret2 // expected-note {{imported as implementation-only here}}
44+
//--- clientWithError.swift
45+
@_exported public import nonResilient // expected-error {{module 'nonResilient' was not compiled with library evolution support; using it means binary compatibility for 'clientWithError' can't be guaranteed}}
46+
// expected-warning @-1 {{public import of 'nonResilient' was not used in public declarations or inlinable code}}
2347

2448
// CHECK-6-NOT: import
2549
// CHECK-6: {{^}}public import A{{$}}
@@ -31,6 +55,5 @@ import NotSoSecret2 // expected-warning {{'NotSoSecret2' inconsistently imported
3155
// CHECK-6-NEXT: {{^}}public import NotSoSecret{{$}}
3256
// CHECK-6-NEXT: {{^}}public import NotSoSecret2{{$}}
3357
// CHECK-6-NEXT: {{^}}public import Swift{{$}}
34-
// CHECK-6-NEXT: {{^}}@_exported public import empty{{$}}
35-
// CHECK-6-NEXT: {{^}}@_exported public import emptyButWithLibraryEvolution{{$}}
58+
// CHECK-6-NEXT: {{^}}@_exported public import resilient{{$}}
3659
// CHECK-6-NOT: import

Diff for: ‎test/ScanDependencies/required_deps_of_testable_imports.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@testable import Foo
99

1010
// Step 1: build swift interface and swift module side by side, make them testable
11-
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name -I %S/Inputs/CHeaders -I %S/Inputs/Swift -enable-testing -enable-experimental-feature AccessLevelOnImport
11+
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name -I %S/Inputs/CHeaders -I %S/Inputs/Swift -enable-testing
1212

1313
// Step 2: scan dependencies
1414
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -sdk %t -prebuilt-module-cache-path %t/clang-module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift

Diff for: ‎test/Sema/access-level-and-non-resilient-import.swift

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// a non-resilient module.
33

44
// RUN: %empty-directory(%t)
5-
// RUN: split-file %s %t
5+
// RUN: split-file --leading-lines %s %t
66

77
// REQUIRES: asserts
88

@@ -15,14 +15,18 @@
1515
// RUN: %target-swift-frontend -emit-module %t/PrivateLib.swift -o %t
1616

1717
/// A resilient client will error on public imports.
18+
/// Keep AccessLevelOnImport to get the error from Swift 6 in Swift 5.
1819
// RUN: %target-swift-frontend -typecheck %t/Client_Swift5.swift -I %t \
1920
// RUN: -enable-library-evolution -swift-version 5 \
2021
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
2122
// RUN: -package-name pkg
2223
// RUN: %target-swift-frontend -typecheck %t/Client_Swift6.swift -I %t \
23-
// RUN: -enable-library-evolution -swift-version 6 \
24-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
24+
// RUN: -enable-library-evolution -swift-version 6 -verify \
2525
// RUN: -package-name pkg
26+
// RUN: %target-swift-frontend -typecheck %t/Client_Swift6.swift -I %t \
27+
// RUN: -enable-library-evolution \
28+
// RUN: -enable-upcoming-feature InternalImportsByDefault \
29+
// RUN: -verify -package-name pkg
2630

2731
/// A non-resilient client doesn't complain.
2832
// RUN: %target-swift-frontend -typecheck %t/Client_Swift5.swift -I %t \
@@ -31,7 +35,9 @@
3135
// RUN: -package-name pkg
3236
// RUN: %target-swift-frontend -typecheck %t/Client_Swift6.swift -I %t \
3337
// RUN: -swift-version 6 \
34-
// RUN: -enable-experimental-feature AccessLevelOnImport \
38+
// RUN: -package-name pkg
39+
// RUN: %target-swift-frontend -typecheck %t/Client_Swift6.swift -I %t \
40+
// RUN: -enable-upcoming-feature InternalImportsByDefault \
3541
// RUN: -package-name pkg
3642

3743
//--- DefaultLib.swift
@@ -55,7 +61,7 @@ private import PrivateLib
5561
//--- Client_Swift6.swift
5662

5763
import DefaultLib
58-
public import PublicLib // expected-error {{module 'PublicLib' was not compiled with library evolution support; using it means binary compatibility for 'Client_Swift6' can't be guaranteed}} {{1-7=internal}}
64+
public import PublicLib // expected-error {{module 'PublicLib' was not compiled with library evolution support; using it means binary compatibility for 'Client_Swift6' can't be guaranteed}} {{1-8=}}
5965
// expected-warning @-1 {{public import of 'PublicLib' was not used in public declarations or inlinable code}}
6066
package import PackageLib
6167
// expected-warning @-1 {{package import of 'PackageLib' was not used in package declarations}}

Diff for: ‎test/Sema/access-level-import-conformances.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
// RUN: %target-swift-frontend -emit-module %t/ConformanceDefinition.swift -o %t -I %t
77

88
/// Check diagnostics.
9-
// RUN: %target-swift-frontend -typecheck -verify %t/Client.swift -I %t \
10-
// RUN: -enable-experimental-feature AccessLevelOnImport
9+
// RUN: %target-swift-frontend -typecheck -verify %t/Client.swift -I %t
1110

1211
//--- ConformanceBaseTypes.swift
1312
public protocol Proto {}

Diff for: ‎test/Sema/access-level-import-diag-priority.swift

+3-6
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414

1515
/// Check diagnostics.
1616
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
17-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
18-
// RUN: -package-name pkg
17+
// RUN: -package-name pkg -verify
1918
// RUN: %target-swift-frontend -typecheck %t/PackageTypeImportedAsPackageClient.swift -I %t \
20-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
21-
// RUN: -package-name pkg
19+
// RUN: -package-name pkg -verify
2220
// RUN: %target-swift-frontend -typecheck %t/LocalVsImportClient.swift -I %t \
23-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
24-
// RUN: -package-name pkg
21+
// RUN: -package-name pkg -verify
2522

2623
//--- PublicLib.swift
2724
public struct PublicImportType {}

0 commit comments

Comments
 (0)