Merge pull request #78615 from jckarter/addressable-as-suppressable-feature

`AddressableTypes` should be a SUPPRESSIBLE_LANGUAGE_FEATURE.

Author: jckarter

include/swift/Basic/Features.def

@@ -438,7 +438,7 @@ EXPERIMENTAL_FEATURE(CoroutineAccessorsAllocateInCallee, false)
 EXPERIMENTAL_FEATURE(GenerateForceToMainActorThunks, false)
 
 EXPERIMENTAL_FEATURE(AddressableParameters, true)
-EXPERIMENTAL_FEATURE(AddressableTypes, true)
+SUPPRESSIBLE_EXPERIMENTAL_FEATURE(AddressableTypes, true)
 
 /// Allow the @abi attribute.
 SUPPRESSIBLE_EXPERIMENTAL_FEATURE(ABIAttribute, true)

lib/AST/ASTPrinter.cpp

@@ -3158,13 +3158,30 @@ suppressingFeatureIsolatedDeinit(PrintOptions &options,
   action();
 }
 
+namespace {
+struct ExcludeAttrRAII {
+  std::vector<AnyAttrKind> &ExcludeAttrList;
+  unsigned OriginalExcludeAttrCount;
+  
+  ExcludeAttrRAII(std::vector<AnyAttrKind> &ExcludeAttrList,
+                  DeclAttrKind excluded)
+    : ExcludeAttrList(ExcludeAttrList),
+      OriginalExcludeAttrCount(ExcludeAttrList.size())
+  {
+    ExcludeAttrList.push_back(excluded);
+  }
+  
+  ~ExcludeAttrRAII() {
+    ExcludeAttrList.resize(OriginalExcludeAttrCount);
+  }
+};
+}
+
 static void
 suppressingFeatureAllowUnsafeAttribute(PrintOptions &options,
                                        llvm::function_ref<void()> action) {
-  unsigned originalExcludeAttrCount = options.ExcludeAttrList.size();
-  options.ExcludeAttrList.push_back(DeclAttrKind::Unsafe);
+  ExcludeAttrRAII scope(options.ExcludeAttrList, DeclAttrKind::Unsafe);
   action();
-  options.ExcludeAttrList.resize(originalExcludeAttrCount);
 }
 
 static void
@@ -3177,11 +3194,17 @@ suppressingFeatureCoroutineAccessors(PrintOptions &options,
 static void
 suppressingFeatureABIAttribute(PrintOptions &options,
                                llvm::function_ref<void()> action) {
-  llvm::SaveAndRestore<bool> scope(options.PrintSyntheticSILGenName, true);
-  unsigned originalExcludeAttrCount = options.ExcludeAttrList.size();
-  options.ExcludeAttrList.push_back(DeclAttrKind::ABI);
+  llvm::SaveAndRestore<bool> scope1(options.PrintSyntheticSILGenName, true);
+  ExcludeAttrRAII scope2(options.ExcludeAttrList, DeclAttrKind::ABI);
+  action();
+}
+
+static void
+suppressingFeatureAddressableTypes(PrintOptions &options,
+                                   llvm::function_ref<void()> action) {
+  ExcludeAttrRAII scope(options.ExcludeAttrList,
+                        DeclAttrKind::AddressableForDependencies);
   action();
-  options.ExcludeAttrList.resize(originalExcludeAttrCount);
 }
 
 /// Suppress the printing of a particular feature.

test/ModuleInterface/addressable_attrs.swift

@@ -0,0 +1,13 @@
+// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name attrs -enable-experimental-feature AddressableTypes
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name attrs
+// RUN: %FileCheck %s --input-file %t.swiftinterface
+
+// REQUIRES: swift_feature_AddressableTypes
+
+@_addressableForDependencies
+public struct Foo {}
+// CHECK: #if {{.*}} $AddressableTypes
+// CHECK: @_addressableForDependencies public struct Foo
+// CHECK: #else
+// CHECK: {{^}}public struct Foo {
+// CHECK: #endif