Merge pull request #67289 from natecook1000/observation_peer_macros

[Observation] Switch to peer instead of arbitrary macros

Author: swift-ci

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -225,15 +225,6 @@ extension ObservableMacro: MemberMacro {
     declaration.addIfNeeded(ObservableMacro.accessFunction(observableType), to: &declarations)
     declaration.addIfNeeded(ObservableMacro.withMutationFunction(observableType), to: &declarations)
 
-#if !OBSERVATION_SUPPORTS_PEER_MACROS
-    let storedInstanceVariables = declaration.definedVariables.filter { $0.isValidForObservation }
-    for property in storedInstanceVariables {
-       if property.hasMacroApplication(ObservableMacro.ignoredMacroName) { continue }
-       let storage = DeclSyntax(property.privatePrefixed("_", addingAttribute: ObservableMacro.ignoredAttribute))
-       declaration.addIfNeeded(storage, to: &declarations)
-    }
-#endif
-
     return declarations
   }
 }

stdlib/public/Observation/Sources/Observation/Observable.swift

@@ -40,11 +40,7 @@ public protocol Observable { }
 ///        }
 ///     }
 @available(SwiftStdlib 5.9, *)
-#if OBSERVATION_SUPPORTS_PEER_MACROS
 @attached(member, names: named(_$observationRegistrar), named(access), named(withMutation))
-#else
-@attached(member, names: named(_$observationRegistrar), named(access), named(withMutation), arbitrary)
-#endif
 @attached(memberAttribute)
 @attached(extension, conformances: Observable)
 public macro Observable() =
@@ -56,9 +52,7 @@ public macro Observable() =
 /// framework isn't necessary.
 @available(SwiftStdlib 5.9, *)
 @attached(accessor, names: named(init), named(get), named(set))
-#if OBSERVATION_SUPPORTS_PEER_MACROS
 @attached(peer, names: prefixed(_))
-#endif
 public macro ObservationTracked() =
   #externalMacro(module: "ObservationMacros", type: "ObservationTrackedMacro")
 

test/stdlib/Observation/Observable.swift

@@ -209,6 +209,10 @@ struct Validator {
 
 
     let suite = TestSuite("Observable")
+
+    suite.test("only instantiate") {
+      let test = MiddleNamePerson()
+    }
 
     suite.test("unobserved value changes") {
       let test = MiddleNamePerson()

test/stdlib/Observation/ObservableDiagnostics.swift

@@ -10,6 +10,7 @@
 // REQUIRES: objc_interop
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
+// REQUIRES: rdar112623492
 
 import Observation