Merge pull request #63057 from xedin/rdar-104210108

[AST] RuntimeMetadata: Generator context should match that of the decl its attached to

Author: xedin

include/swift/AST/Initializer.h

@@ -247,7 +247,7 @@ class RuntimeAttributeInitializer : public Initializer {
 public:
   explicit RuntimeAttributeInitializer(CustomAttr *attr, ValueDecl *attachedTo)
       : Initializer(InitializerKind::RuntimeAttribute,
-                    attachedTo->getDeclContext()->getModuleScopeContext()),
+                    attachedTo->getDeclContext()),
         Attr(attr), AttachedTo(attachedTo) {}
 
   CustomAttr *getAttr() const { return Attr; }

test/SILGen/runtime_attributes.swift

@@ -65,3 +65,39 @@ struct MemberTests {
   // CHECK-NEXT: {{.*}} = apply [[IGNORE_INIT]]<(inout MemberTests) -> Int>({{.*}})
   @Ignore mutating func mutatingFn() -> Int { 42 }
 }
+
+@runtimeMetadata
+struct Flag<U> {
+  init<T>(attachedTo: T, value: U) {}
+}
+
+struct TestSelfUse {
+  static var answer: Int = 42
+  static var question: String = ""
+
+  // CHECK-LABEL: sil hidden [runtime_accessible] [ossa] @$s18runtime_attributes11TestSelfUseV1xSSvpfaAA4Flag : $@convention(thin) () -> @out Optional<Flag<Int>>
+  // CHECK: [[ADDRESSOR:%.*]] = function_ref @$s18runtime_attributes11TestSelfUseV6answerSivau
+  // CHECK-NEXT: [[ADDR_RESULT:%.*]] = apply [[ADDRESSOR]]() : $@convention(thin) () -> Builtin.RawPointer
+  // CHECK-NEXT: [[PROP_ADDR:%.*]] = pointer_to_address [[ADDR_RESULT]] : $Builtin.RawPointer to [strict] $*Int
+  // CHECK-NEXT: [[PROP_ACCESS:%.*]] = begin_access [read] [dynamic] [[PROP_ADDR]] : $*Int
+  // CHECK-NEXT: [[PROP_VALUE:%.*]] = load [trivial] [[PROP_ACCESS]] : $*Int
+  // CHECK_NEXT: end_access [[PROP_ACCESS]] : $*Int
+  // CHECK: [[PROP_VAL_COPY:%.*]] = alloc_stack $Int
+  // CHECK: store [[PROP_VALUE]] to [trivial] [[PROP_VAL_COPY]] : $*Int
+  // CHECK: [[FLAG_INIT_REF:%.*]] = function_ref @$s18runtime_attributes4FlagV10attachedTo5valueACyxGqd___xtclufC
+  // CHECK-NEXT: {{.*}} = apply [[FLAG_INIT_REF]]<Int, WritableKeyPath<TestSelfUse, String>>({{.*}}, [[PROP_VAL_COPY]], {{.*}})
+  @Flag(value: Self.answer) var x: String = ""
+
+  // CHECK-LABEL: sil hidden [runtime_accessible] [ossa] @$s18runtime_attributes11TestSelfUseV4testyycvpfaAA4Flag : $@convention(thin) () -> @out Optional<Flag<String>>
+  // CHECK: [[ADDRESSOR:%.*]] = function_ref @$s18runtime_attributes11TestSelfUseV8questionSSvau
+  // CHECK-NEXT: [[ADDR_RESULT:%.*]] = apply [[ADDRESSOR]]() : $@convention(thin) () -> Builtin.RawPointer
+  // CHECK-NEXT: [[PROP_ADDR:%.*]] = pointer_to_address [[ADDR_RESULT]] : $Builtin.RawPointer to [strict] $*String
+  // CHECK-NEXT: [[PROP_ACCESS:%.*]] = begin_access [read] [dynamic] [[PROP_ADDR]] : $*String
+  // CHECK-NEXT: [[PROP_VALUE:%.*]] = load [copy] [[PROP_ACCESS]] : $*String
+  // CHECK_NEXT: end_access [[PROP_ACCESS]] : $*String
+  // CHECK: [[PROP_VAL_COPY:%.*]] = alloc_stack $String
+  // CHECK: store [[PROP_VALUE]] to [init] [[PROP_VAL_COPY]] : $*String
+  // CHECK: [[FLAG_INIT_REF:%.*]] = function_ref @$s18runtime_attributes4FlagV10attachedTo5valueACyxGqd___xtclufC
+  // CHECK-NEXT: {{.*}} = apply [[FLAG_INIT_REF]]<String, (TestSelfUse) -> ()>({{.*}}, [[PROP_VAL_COPY]], {{.*}})
+  @Flag(value: Self.question) func test() {}
+}

test/type/runtime_discoverable_attrs.swift

@@ -225,3 +225,10 @@ struct TestStaticFuncs {
   @FlagForStaticFuncs static func test1(_: Int.Type) {}
   @FlagForStaticFuncs static func test2(_: inout [String], x: Int) {}
 }
+
+struct TestSelfUse {
+  static var description: String = "TestSelfUse"
+
+  @Flag(Self.description) var x: Int = 42
+  @Flag(Self.description) func test() {}
+}