Merge pull request #73843 from nate-chandler/rdar128611158

[Features] Move NoncopyableGenerics up.

Author: nate-chandler

include/swift/Basic/Features.def

@@ -192,9 +192,9 @@ SUPPRESSIBLE_LANGUAGE_FEATURE(AssociatedTypeImplements, 0, "@_implements on asso
 LANGUAGE_FEATURE(BuiltinAddressOfRawLayout, 0, "Builtin.addressOfRawLayout")
 LANGUAGE_FEATURE(MoveOnlyPartialConsumption, 429, "Partial consumption of noncopyable values")
 LANGUAGE_FEATURE(BitwiseCopyable, 426, "BitwiseCopyable protocol")
+SUPPRESSIBLE_LANGUAGE_FEATURE(NoncopyableGenerics, 427, "Noncopyable generics")
 SUPPRESSIBLE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances")
 SUPPRESSIBLE_LANGUAGE_FEATURE(BitwiseCopyable2, 426, "BitwiseCopyable feature")
-SUPPRESSIBLE_LANGUAGE_FEATURE(NoncopyableGenerics, 427, "Noncopyable generics")
 LANGUAGE_FEATURE(BodyMacros, 415, "Function body macros")
 
 // Swift 6

test/ModuleInterface/conformance_suppression.swift

@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Mojuel
+// RUN: %FileCheck %s < %t.swiftinterface
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface -module-name Mojuel)
+
+// CHECK:      #if compiler(>=5.3) && $ConformanceSuppression
+// CHECK-NEXT: public enum RecollectionOrganization<T> : ~Swift.BitwiseCopyable, Swift.Copyable where T : ~Copyable {
+// CHECK-NEXT: }
+// CHECK-NEXT: #elseif compiler(>=5.3) && $NoncopyableGenerics
+// CHECK-NEXT: public enum RecollectionOrganization<T> : Swift.Copyable where T : ~Copyable {
+// CHECK-NEXT: }
+// CHECK-NEXT: #else
+// CHECK-NEXT: public enum RecollectionOrganization<T> {
+// CHECK-NEXT: }
+// CHECK-NEXT: #endif
+public enum RecollectionOrganization<T : ~Copyable> : ~BitwiseCopyable, Copyable {}