---

yaml
---
r: 344984
b: refs/heads/master
c: 6128824
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1923c27346f74c21fc19756db61294b9283fbfa5
+refs/heads/master: 612882491ac70ee1584554759191034c24fb74f4
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/ParseDecl.cpp

@@ -5481,8 +5481,6 @@ ParserResult<EnumDecl> Parser::parseDeclEnum(ParseDeclOptions Flags,
                                         { }, nullptr, CurDeclContext);
   setLocalDiscriminator(ED);
   ED->getAttrs() = Attributes;
-  if (SF.Kind == SourceFileKind::Interface)
-    ED->setAddedImplicitInitializers();
 
   ContextChange CC(*this, ED);
 
@@ -5755,8 +5753,6 @@ ParserResult<StructDecl> Parser::parseDeclStruct(ParseDeclOptions Flags,
                                             CurDeclContext);
   setLocalDiscriminator(SD);
   SD->getAttrs() = Attributes;
-  if (SF.Kind == SourceFileKind::Interface)
-    SD->setAddedImplicitInitializers();
 
   ContextChange CC(*this, SD);
 
@@ -5845,8 +5841,6 @@ ParserResult<ClassDecl> Parser::parseDeclClass(ParseDeclOptions Flags,
                                           { }, nullptr, CurDeclContext);
   setLocalDiscriminator(CD);
   CD->getAttrs() = Attributes;
-  if (SF.Kind == SourceFileKind::Interface)
-    CD->setAddedImplicitInitializers();
 
   ContextChange CC(*this, CD);
 

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -5263,6 +5263,14 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
   if (decl->isInvalid())
     return;
 
+  // Don't add implicit constructors in textual interfaces.
+  if (auto *SF = decl->getParentSourceFile()) {
+    if (SF->Kind == SourceFileKind::Interface) {
+      decl->setAddedImplicitInitializers();
+      return;
+    }
+  }
+
   // Bail out if we're validating one of our constructors already; we'll
   // revisit the issue later.
   if (isa<ClassDecl>(decl)) {