Sema: Remove SourceFile::SynthesizedDecls

Author: slavapestov

include/swift/AST/SourceFile.h

@@ -217,9 +217,6 @@ class SourceFile final : public FileUnit {
   /// The list of local type declarations in the source file.
   llvm::SetVector<TypeDecl *> LocalTypeDecls;
 
-  /// A set of synthesized declarations that need to be type checked.
-  llvm::SmallVector<Decl *, 8> SynthesizedDecls;
-
   /// The list of functions defined in this file whose bodies have yet to be
   /// typechecked. They must be held in this list instead of eagerly validated
   /// because their bodies may force us to perform semantic checks of arbitrary
@@ -228,11 +225,6 @@ class SourceFile final : public FileUnit {
   /// unless the entire conformance has been evaluated.
   std::vector<AbstractFunctionDecl *> DelayedFunctions;
 
-  /// We might perform type checking on the same source file more than once,
-  /// if its the main file or a REPL instance, so keep track of the last
-  /// checked synthesized declaration to avoid duplicating work.
-  unsigned LastCheckedSynthesizedDecl = 0;
-
   /// A mapping from Objective-C selectors to the methods that have
   /// those selectors.
   llvm::DenseMap<ObjCSelector, llvm::TinyPtrVector<AbstractFunctionDecl *>>

lib/Sema/DerivedConformances.cpp

@@ -43,12 +43,8 @@ DeclContext *DerivedConformance::getConformanceContext() const {
 void DerivedConformance::addMembersToConformanceContext(
     ArrayRef<Decl *> children) {
   auto IDC = cast<IterableDeclContext>(ConformanceDecl);
-  auto *SF = ConformanceDecl->getDeclContext()->getParentSourceFile();
-  for (auto child : children) {
+  for (auto child : children)
     IDC->addMember(child);
-    if (SF)
-      SF->SynthesizedDecls.push_back(child);
-  }
 }
 
 Type DerivedConformance::getProtocolType() const {

lib/Sema/TypeChecker.cpp

@@ -247,28 +247,13 @@ void swift::bindExtensions(ModuleDecl &mod) {
 
 static void typeCheckDelayedFunctions(SourceFile &SF) {
   unsigned currentFunctionIdx = 0;
-  unsigned currentSynthesizedDecl = SF.LastCheckedSynthesizedDecl;
-  do {
-    // Type check the body of each of the function in turn.  Note that outside
-    // functions must be visited before nested functions for type-checking to
-    // work correctly.
-    for (unsigned n = SF.DelayedFunctions.size(); currentFunctionIdx != n;
-         ++currentFunctionIdx) {
-      auto *AFD = SF.DelayedFunctions[currentFunctionIdx];
-      assert(!AFD->getDeclContext()->isLocalContext());
-      (void)AFD->getTypecheckedBody();
-    }
 
-    // Type check synthesized functions and their bodies.
-    for (unsigned n = SF.SynthesizedDecls.size();
-         currentSynthesizedDecl != n;
-         ++currentSynthesizedDecl) {
-      auto decl = SF.SynthesizedDecls[currentSynthesizedDecl];
-      TypeChecker::typeCheckDecl(decl);
-    }
-
-  } while (currentFunctionIdx < SF.DelayedFunctions.size() ||
-           currentSynthesizedDecl < SF.SynthesizedDecls.size());
+  while (currentFunctionIdx < SF.DelayedFunctions.size()) {
+    auto *AFD = SF.DelayedFunctions[currentFunctionIdx];
+    assert(!AFD->getDeclContext()->isLocalContext());
+    (void) AFD->getTypecheckedBody();
+    ++currentFunctionIdx;
+  }
 
   SF.DelayedFunctions.clear();
 }

test/Sema/enum_conformance_synthesis.swift

@@ -61,7 +61,7 @@ func customHashable() {
 enum InvalidCustomHashable {
   case A, B
 
-  var hashValue: String { return "" } // expected-error {{invalid redeclaration of synthesized implementation for protocol requirement 'hashValue'}}
+  var hashValue: String { return "" }
 }
 func ==(x: InvalidCustomHashable, y: InvalidCustomHashable) -> String {
   return ""

test/Sema/enum_raw_representable.swift

@@ -56,12 +56,16 @@ enum Color : Int {
     return nil
   }
 
-  var rawValue: Double {
-  // expected-error@-1 {{invalid redeclaration of synthesized implementation for protocol requirement 'rawValue'}}
+  var rawValue: Double { // expected-note {{found this candidate}}
     return 1.0
   }
 }
 
+func useRawValue(of color: Color) {
+  _ = color.rawValue
+  // expected-error@-1 {{ambiguous use of 'rawValue'}}
+}
+
 var colorRaw: Color.RawValue = 7.5
 // expected-error@-1 {{cannot convert value of type 'Double' to specified type 'Color.RawValue' (aka 'Int')}}