Improve redeclaration error for implicit inits

Author: AnthonyLatsis

include/swift/AST/DiagnosticsSema.def

@@ -667,6 +667,9 @@ ERROR(reserved_member_name,none,
       " 'foo.%1' expression", (DeclName, StringRef))
 
 ERROR(invalid_redecl,none,"invalid redeclaration of %0", (DeclName))
+ERROR(invalid_redecl_init,none,
+      "invalid redeclaration of %select{synthesized|"
+      "synthesized memberwise|inherited}1 %0", (DeclName, unsigned))
 WARNING(invalid_redecl_swift5_warning,none,
         "redeclaration of %0 is deprecated and will be an error in Swift 5",
         (DeclName))

lib/Sema/TypeCheckDecl.cpp

@@ -914,8 +914,23 @@ static void checkRedeclaration(TypeChecker &tc, ValueDecl *current) {
                     current->getFullName());
         tc.diagnose(other, diag::invalid_redecl_prev, other->getFullName());
       } else {
-        tc.diagnose(current, diag::invalid_redecl, current->getFullName());
-        tc.diagnose(other, diag::invalid_redecl_prev, other->getFullName());
+        const auto *otherInit = dyn_cast<ConstructorDecl>(other);
+        // Provide a better description for implicit initializers.
+        if (otherInit && otherInit->isImplicit()) {
+          enum {
+            Synthetic, SyntheticMemberwise, Inherited
+          } kind = Synthetic;
+          if (otherInit->isMemberwiseInitializer())
+            kind = SyntheticMemberwise;
+          else if (otherInit->getOverriddenDecl())
+            kind = Inherited;
+
+          tc.diagnose(current, diag::invalid_redecl_init,
+                      current->getFullName(), kind);
+        } else {
+          tc.diagnose(current, diag::invalid_redecl, current->getFullName());
+          tc.diagnose(other, diag::invalid_redecl_prev, other->getFullName());
+        }
         markInvalid();
       }
 

test/decl/init/basic_init.swift

@@ -13,8 +13,26 @@ class C {
 typealias t = t // expected-error {{type alias 't' references itself}}
 // expected-note@-1{{type declared here}}
 
+extension Foo {
+  convenience init() {} // expected-error{{invalid redeclaration of synthesized 'init()'}}
+}
 
+class InitClass {
+  init(arg: Bool) {} // expected-note{{add '@objc' to make this declaration overridable}}
+}
+class InitSubclass: InitClass {}
+extension InitSubclass {
+  convenience init(arg: Bool) {}
+  // expected-error@-1{{invalid redeclaration of inherited 'init(arg:)'}}
+  // expected-error@-2{{overriding non-@objc declarations from extensions is not supported}}
+}
 
+struct InitStruct {
+  let foo: Int
+}
+extension InitStruct {
+  init(foo: Int) {} // expected-error{{invalid redeclaration of synthesized memberwise 'init(foo:)'}}
+}
 
 // <rdar://problem/17564699> QoI: Structs should get convenience initializers
 struct MyStruct {