Merge pull request #72857 from li3zhen1/fix-init-accessor-71578

[AccessRequests] Allow Init accessor to be `internal`

Author: xedin

include/swift/AST/DiagnosticsParse.def

@@ -2158,6 +2158,10 @@ ERROR(init_accessor_is_not_on_property,none,
       "init accessors could only be associated with properties",
       ())
 
+ERROR(init_accessor_is_not_in_the_primary_declaration,none,
+      "init accessors cannot be declared in an extension",
+      ())
+
 ERROR(missing_storage_restrictions_attr_label,none,
       "missing label in @storageRestrictions attribute", ())
 

lib/AST/AccessRequests.cpp

@@ -65,8 +65,8 @@ AccessLevelRequest::evaluate(Evaluator &evaluator, ValueDecl *D) const {
       // These are only needed to synthesize the setter.
       return AccessLevel::Private;
     case AccessorKind::Init:
-      // These are only called from designated initializers.
-      return AccessLevel::Private;
+      // These are only called from within the same module.
+      return std::min(storage->getFormalAccess(), AccessLevel::Internal);
     }
   }
 

lib/Parse/ParseDecl.cpp

@@ -8497,8 +8497,11 @@ void Parser::ParsedAccessors::classify(Parser &P, AbstractStorageDecl *storage,
   }
 
   if (Init) {
-    if (!storage->getDeclContext()->getSelfNominalTypeDecl() ||
-        isa<SubscriptDecl>(storage)) {
+    auto *DC = storage->getDeclContext();
+    if (isa<ExtensionDecl>(DC)) {
+      P.diagnose(Init->getLoc(),
+                 diag::init_accessor_is_not_in_the_primary_declaration);
+    } else if (!DC->isTypeContext() || isa<SubscriptDecl>(storage)) {
       P.diagnose(Init->getLoc(), diag::init_accessor_is_not_on_property);
     }
   }

test/SILOptimizer/init_accessors.swift

@@ -10,7 +10,7 @@ struct TestInit {
   var full: (Int, Int)
 
   var point: (Int, Int) {
-    // CHECK-LABEL: sil private [ossa] @$s14init_accessors8TestInitV5pointSi_Sitvi : $@convention(thin) (Int, Int, @inout Int, @thin TestInit.Type) -> (@out Int, @out (Int, Int))
+    // CHECK-LABEL: sil hidden [ossa] @$s14init_accessors8TestInitV5pointSi_Sitvi : $@convention(thin) (Int, Int, @inout Int, @thin TestInit.Type) -> (@out Int, @out (Int, Int))
     // CHECK: bb0([[Y_REF:%.*]] : $*Int, [[FULL_REF:%.*]] : $*(Int, Int), [[X_VAL:%.*]] : $Int, [[Y_VAL:%.*]] : $Int, [[X_REF:%.*]] : $*Int, [[METATYPE:%.*]] : $@thin TestInit.Type):
     //
     // CHECK: [[INITIAL_VALUE:%.*]] = tuple ([[X_VAL]] : $Int, [[Y_VAL]] : $Int)
@@ -230,7 +230,7 @@ class TestClass {
   var y: (Int, [String])
 
   var data: (Int, (Int, [String])) {
-    // CHECK-LABEL: sil private [ossa] @$s14init_accessors9TestClassC4dataSi_Si_SaySSGttvi : $@convention(thin) (Int, Int, @owned Array<String>, @thick TestClass.Type) -> (@out Int, @out (Int, Array<String>))
+    // CHECK-LABEL: sil hidden [ossa] @$s14init_accessors9TestClassC4dataSi_Si_SaySSGttvi : $@convention(thin) (Int, Int, @owned Array<String>, @thick TestClass.Type) -> (@out Int, @out (Int, Array<String>))
     // CHECK: bb0([[X_REF:%.*]] : $*Int, [[Y_REF:%.*]] : $*(Int, Array<String>), [[X_VAL:%.*]] : $Int, [[Y_VAL_0:%.*]] : $Int, [[Y_VAL_1:%.*]] : @owned $Array<String>, [[METATYPE:%.*]] : $@thick TestClass.Type):
     //
     // CHECK: ([[X_VAL:%.*]], [[Y_VAL:%.*]]) = destructure_tuple {{.*}} : $(Int, (Int, Array<String>))
@@ -277,7 +277,7 @@ struct TestGeneric<T, U> {
   var b: T
   var c: U
 
-  // CHECK-LABEL: sil private [ossa] @$s14init_accessors11TestGenericV4datax_xtvi : $@convention(thin) <T, U> (@in T, @in T, @inout U, @thin TestGeneric<T, U>.Type) -> (@out T, @out T)
+  // CHECK-LABEL: sil hidden [ossa] @$s14init_accessors11TestGenericV4datax_xtvi : $@convention(thin) <T, U> (@in T, @in T, @inout U, @thin TestGeneric<T, U>.Type) -> (@out T, @out T)
   //
   // CHECK: bb0([[A_REF:%.*]] : $*T, [[B_REF:%.*]] : $*T, [[A_VALUE:%.*]] : $*T, [[B_VALUE:%.*]] : $*T, [[C_REF:%.*]] : $*U, [[METATYPE:%.*]] : $@thin TestGeneric<T, U>.Type):
   //
@@ -326,7 +326,7 @@ struct TestGenericTuple<T, U> {
   var a: T
   var b: (T, U)
 
-  // CHECK-LABEL: sil private [ossa] @$s14init_accessors16TestGenericTupleV4datax_x_q_ttvi : $@convention(thin) <T, U> (@in T, @in T, @in U, @thin TestGenericTuple<T, U>.Type) -> (@out T, @out (T, U)) {
+  // CHECK-LABEL: sil hidden [ossa] @$s14init_accessors16TestGenericTupleV4datax_x_q_ttvi : $@convention(thin) <T, U> (@in T, @in T, @in U, @thin TestGenericTuple<T, U>.Type) -> (@out T, @out (T, U)) {
   //
   // CHECK: bb0([[A_REF:%.*]] : $*T, [[B_REF:%.*]] : $*(T, U), [[A_VALUE:%.*]] : $*T, [[B_VALUE:%.*]] : $*T, [[C_VALUE:%.*]] : $*U, [[METATYPE:%.*]] : $@thin TestGenericTuple<T, U>.Type):
   //

test/decl/var/Inputs/imported_init_accessor.swift

@@ -0,0 +1,48 @@
+struct S {
+  var _x: Int
+  public var xImmutablePublic: Int {
+    @storageRestrictions(initializes: _x)
+    init {
+      _x = initialValue
+    }
+    get {
+      return _x
+    }
+  }
+  
+  public var xMutablePublic: Int {
+    @storageRestrictions(initializes: _x)
+    init {
+      _x = initialValue
+    }
+    get {
+      return _x
+    }
+    set {
+      _x = newValue
+    }
+  }
+  
+  internal var xImmutableInternal: Int {
+    @storageRestrictions(initializes: _x)
+    init {
+      _x = initialValue
+    }
+    get {
+      return _x
+    }
+  }
+  
+  internal var xMutableInternal: Int {
+    @storageRestrictions(initializes: _x)
+    init {
+      _x = initialValue
+    }
+    get {
+      return _x
+    }
+    set {
+      _x = newValue
+    }
+  }
+}

test/decl/var/init_accessors.swift

@@ -690,3 +690,19 @@ do {
   _ = Test2(q: "some question") // Ok `a` is default initialized to `nil`
   _ = Test2(q: "ultimate question", a: 42)
 }
+
+struct Test2ForExtension {
+  var _x: Int
+}
+
+extension Test2ForExtension {
+  var extendedX: Int {
+    @storageRestrictions(initializes: _x)
+    init {
+      // expected-error@-1 {{init accessors cannot be declared in an extension}}
+      self._x = newValue
+    }
+    get { _x }
+    set { _x = newValue }
+  }
+}

test/decl/var/init_accessors_multi_file.swift

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %s -verify -O -primary-file %s %S/Inputs/imported_init_accessor.swift -c -o %t/init_accessors_multi_file.o
+
+extension S {
+  init(extendedX: Int) {
+    self.xImmutablePublic = extendedX
+  }
+}
+
+func test() {
+  let s = S(extendedX: 42)
+  _ = s.xImmutablePublic
+}