[Sema] Lift flag requirement for access level on imports

Author: xymus

include/swift/AST/DiagnosticsSema.def

@@ -2356,9 +2356,6 @@ ERROR(spi_only_imports_not_enabled, none,
       ())
 
 // Access level on imports
-ERROR(access_level_on_import_not_enabled, none,
-      "Access level on imports require '-enable-experimental-feature AccessLevelOnImport'",
-      ())
 ERROR(access_level_on_import_unsupported, none,
       "The access level %0 is unsupported on imports: "
       "only 'public', 'package', 'internal', 'fileprivate' and 'private' "

lib/Sema/TypeCheckAttr.cpp

@@ -998,13 +998,6 @@ bool AttributeChecker::visitAbstractAccessControlAttr(
 
   SourceFile *File = D->getDeclContext()->getParentSourceFile();
   if (auto importDecl = dyn_cast<ImportDecl>(D)) {
-    if (!D->getASTContext().LangOpts.hasFeature(Feature::AccessLevelOnImport) &&
-        !D->getASTContext().LangOpts.hasFeature(Feature::InternalImports) &&
-        File && File->Kind != SourceFileKind::Interface) {
-      diagnoseAndRemoveAttr(attr, diag::access_level_on_import_not_enabled);
-      return true;
-    }
-
     if (attr->getAccess() == AccessLevel::Open) {
       diagnoseAndRemoveAttr(attr, diag::access_level_on_import_unsupported,
                             attr);

test/Sema/access-level-import-flag-check.swift

@@ -14,14 +14,11 @@
 // RUN:   -enable-library-evolution
 
 /// Check flag requirement, without and with the flag.
-// RUN: %target-swift-frontend -typecheck %t/ClientWithoutTheFlag.swift -I %t -verify \
-// RUN:   -package-name package
 // RUN: %target-swift-frontend -typecheck %t/ClientWithoutTheFlag.swift -I %t \
-// RUN:   -enable-experimental-feature AccessLevelOnImport \
-// RUN:   -package-name package
+// RUN:   -package-name package -verify
 // RUN: %target-swift-frontend -typecheck %t/ClientWithoutTheFlag.swift -I %t \
 // RUN:   -enable-upcoming-feature InternalImportsByDefault \
-// RUN:   -package-name package
+// RUN:   -package-name package -verify
 // REQUIRES: asserts
 
 /// swiftinterfaces don't need the flag.
@@ -34,13 +31,13 @@
 //--- PrivateLib.swift
 
 //--- ClientWithoutTheFlag.swift
-public import PublicLib // expected-error@:1 {{Access level on imports require '-enable-experimental-feature AccessLevelOnImport'}}
+public import PublicLib
 // expected-warning @-1 {{public import of 'PublicLib' was not used in public declarations or inlinable code}}
-package import PackageLib // expected-error@:1 {{Access level on imports require '-enable-experimental-feature AccessLevelOnImport'}}
+package import PackageLib
 // expected-warning @-1 {{package import of 'PackageLib' was not used in package declarations}}
-internal import InternalLib // expected-error@:1 {{Access level on imports require '-enable-experimental-feature AccessLevelOnImport'}}
-fileprivate import FileprivateLib // expected-error@:1 {{Access level on imports require '-enable-experimental-feature AccessLevelOnImport'}}
-private import PrivateLib // expected-error@:1 {{Access level on imports require '-enable-experimental-feature AccessLevelOnImport'}}
+internal import InternalLib
+fileprivate import FileprivateLib
+private import PrivateLib
 
 //--- Client.swiftinterface
 // swift-interface-format-version: 1.0