add language feature SafeInteropWrappers

This replaces the language option
-enable-experimental-bounds-safety-interop.

Author: hnrklssn

include/swift/Basic/Features.def

@@ -406,6 +406,10 @@ EXPERIMENTAL_FEATURE(WarnUnsafe, true)
 /// Import unsafe C and C++ constructs as @unsafe.
 EXPERIMENTAL_FEATURE(SafeInterop, true)
 
+// Import bounds safety and lifetime attributes from interop headers to
+// generate Swift wrappers with safe pointer types.
+EXPERIMENTAL_FEATURE(SafeInteropWrappers, false)
+
 /// Ignore resilience errors due to C++ types.
 EXPERIMENTAL_FEATURE(AssumeResilientCxxTypes, true)
 

include/swift/Basic/LangOptions.h

@@ -325,10 +325,6 @@ namespace swift {
     /// disabled because it is not complete.
     bool EnableCXXInterop = false;
 
-    /// Enable C interop importing bounds safety and lifetime attributes to
-    /// generate Swift wrappers with safe pointer types (experimental).
-    bool EnableBoundsSafetyInterop = false;
-
     /// The C++ interoperability source compatibility version. Defaults
     /// to the Swift language version.
     version::Version cxxInteropCompatVersion;

lib/AST/FeatureSet.cpp

@@ -321,6 +321,7 @@ static bool usesFeatureAllowUnsafeAttribute(Decl *decl) {
 
 UNINTERESTING_FEATURE(WarnUnsafe)
 UNINTERESTING_FEATURE(SafeInterop)
+UNINTERESTING_FEATURE(SafeInteropWrappers)
 UNINTERESTING_FEATURE(AssumeResilientCxxTypes)
 UNINTERESTING_FEATURE(CoroutineAccessorsUnwindOnCallerError)
 UNINTERESTING_FEATURE(CoroutineAccessorsAllocateInCallee)

lib/ClangImporter/ClangImporter.cpp

@@ -578,7 +578,7 @@ void importer::getNormalInvocationArguments(
     }
   }
 
-  if (LangOpts.EnableBoundsSafetyInterop)
+  if (LangOpts.hasFeature(Feature::SafeInteropWrappers))
     invocationArgStrs.push_back("-fexperimental-bounds-safety-attributes");
 
   // Set C language options.

lib/ClangImporter/ImportDecl.cpp

@@ -8663,7 +8663,7 @@ class PointerParamInfoPrinter {
 
 void ClangImporter::Implementation::importBoundsAttributes(
     FuncDecl *MappedDecl) {
-  assert(SwiftContext.LangOpts.EnableBoundsSafetyInterop);
+  assert(SwiftContext.LangOpts.hasFeature(Feature::SafeInteropWrappers));
   auto ClangDecl =
       dyn_cast_or_null<clang::FunctionDecl>(MappedDecl->getClangDecl());
   // any function with safe pointer imports should have a clang decl
@@ -8683,7 +8683,6 @@ void ClangImporter::Implementation::importBoundsAttributes(
     }
   }
 
-
   // Dig out a source file we can use for parsing.
   auto &sourceFile = getClangSwiftAttrSourceFile(
       *MappedDecl->getDeclContext()->getParentModule(), MacroString);

lib/Frontend/CompilerInvocation.cpp

@@ -1449,9 +1449,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
                    Target.isOSDarwin() && !Opts.hasFeature(Feature::Embedded));
 
-  Opts.EnableBoundsSafetyInterop =
-      Args.hasArg(OPT_enable_experimental_bounds_safety_interop);
-
   Opts.CForeignReferenceTypes =
       Args.hasArg(OPT_experimental_c_foreign_reference_types);
 

test/Interop/C/pointer-bounds/counted-by.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -disable-availability-checking -plugin-path %swift-plugin-dir -o %t/CountedBy.swiftmodule -I %S/Inputs -enable-experimental-bounds-safety-interop %s
+// RUN: %target-swift-frontend -emit-module -disable-availability-checking -plugin-path %swift-plugin-dir -o %t/CountedBy.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
 
 // Check that ClangImporter correctly infers and expands @PointerBounds macros for functions with __counted_by parameters.