Merge pull request #36403 from slavapestov/remove-synthesized-decls

slavapestov · web-flow · commit bfa690e12168 · 2021-04-21T15:11:13.000-04:00
Sema: Remove SourceFile::SynthesizedDecls
diff --git a/include/swift/AST/SourceFile.h b/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 *>>
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
@@ -1034,16 +1034,13 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
   void emitType() {
     SGM.emitLazyConformancesForType(theType);
 
+    for (Decl *member : theType->getABIMembers())
+      visit(member);
+
     // Build a vtable if this is a class.
     if (auto theClass = dyn_cast<ClassDecl>(theType)) {
-      for (Decl *member : theClass->getABIMembers())
-        visit(member);
-
       SILGenVTable genVTable(SGM, theClass);
       genVTable.emitVTable();
-    } else {
-      for (Decl *member : theType->getMembers())
-        visit(member);
     }
 
     // Build a default witness table if this is a protocol that needs one.
@@ -1063,10 +1060,9 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
     // are existential and do not have witness tables.
     for (auto *conformance : theType->getLocalConformances(
                                ConformanceLookupKind::NonInherited)) {
-      if (conformance->isComplete()) {
-        if (auto *normal = dyn_cast<NormalProtocolConformance>(conformance))
-          SGM.getWitnessTable(normal);
-      }
+      assert(conformance->isComplete());
+      if (auto *normal = dyn_cast<NormalProtocolConformance>(conformance))
+        SGM.getWitnessTable(normal);
     }
   }
 
@@ -1178,18 +1174,17 @@ class SILGenExtension : public TypeMemberVisitor<SILGenExtension> {
 
   /// Emit SIL functions for all the members of the extension.
   void emitExtension(ExtensionDecl *e) {
-    for (Decl *member : e->getMembers())
+    for (Decl *member : e->getABIMembers())
       visit(member);
 
     if (!isa<ProtocolDecl>(e->getExtendedNominal())) {
       // Emit witness tables for protocol conformances introduced by the
       // extension.
       for (auto *conformance : e->getLocalConformances(
                                  ConformanceLookupKind::All)) {
-        if (conformance->isComplete()) {
-          if (auto *normal =dyn_cast<NormalProtocolConformance>(conformance))
-            SGM.getWitnessTable(normal);
-        }
+        assert(conformance->isComplete());
+        if (auto *normal =dyn_cast<NormalProtocolConformance>(conformance))
+          SGM.getWitnessTable(normal);
       }
     }
   }
diff --git a/lib/Sema/CodeSynthesis.cpp b/lib/Sema/CodeSynthesis.cpp
@@ -1312,10 +1312,6 @@ ResolveEffectiveMemberwiseInitRequest::evaluate(Evaluator &evaluator,
         continue;
       storedProperties.push_back(vd);
     }
-    // Return false if initializer does not have interface type set. It is not
-    // possible to determine whether it is a memberwise initializer.
-    if (!initDecl->hasInterfaceType())
-      return false;
     auto initDeclType =
         initDecl->getMethodInterfaceType()->getAs<AnyFunctionType>();
     // Return false if initializer does not have a valid interface type.
diff --git a/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp b/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp
@@ -207,6 +207,12 @@ static ValueDecl *deriveMathOperator(DerivedConformance &derived,
   operatorDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
 
   derived.addMembersToConformanceContext({operatorDecl});
+
+  // For the effective memberwise initializer before we force the body,
+  // so that it becomes part of the emitted ABI members even if we don't
+  // emit the body.
+  (void) nominal->getEffectiveMemberwiseInitializer();
+
   return operatorDecl;
 }
 
@@ -311,6 +317,12 @@ static ValueDecl *deriveAdditiveArithmetic_zero(DerivedConformance &derived) {
   getterDecl->setBodySynthesizer(deriveBodyAdditiveArithmetic_zero, nullptr);
 
   derived.addMembersToConformanceContext({propDecl, pbDecl});
+
+  // For the effective memberwise initializer before we force the body,
+  // so that it becomes part of the emitted ABI members even if we don't
+  // emit the body.
+  (void) nominal->getEffectiveMemberwiseInitializer();
+
   return propDecl;
 }
 
diff --git a/lib/Sema/DerivedConformanceDifferentiable.cpp b/lib/Sema/DerivedConformanceDifferentiable.cpp
@@ -337,51 +337,6 @@ static ValueDecl *deriveDifferentiable_move(DerivedConformance &derived) {
       C.TheEmptyTupleType, {deriveBodyDifferentiable_move, nullptr});
 }
 
-/// Pushes all the protocols inherited, directly or transitively, by `decl` to `protos`.
-///
-/// Precondition: `decl` is a nominal type decl or an extension decl.
-void getInheritedProtocols(Decl *decl, SmallPtrSetImpl<ProtocolDecl *> &protos) {
-  ArrayRef<TypeLoc> inheritedTypeLocs;
-  if (auto *nominalDecl = dyn_cast<NominalTypeDecl>(decl))
-    inheritedTypeLocs = nominalDecl->getInherited();
-  else if (auto *extDecl = dyn_cast<ExtensionDecl>(decl))
-    inheritedTypeLocs = extDecl->getInherited();
-  else
-    llvm_unreachable("conformance is not a nominal or an extension");
-
-  std::function<void(Type)> handleInheritedType;
-
-  auto handleProto = [&](ProtocolType *proto) -> void {
-    proto->getDecl()->walkInheritedProtocols([&](ProtocolDecl *p) -> TypeWalker::Action {
-      protos.insert(p);
-      return TypeWalker::Action::Continue;
-    });
-  };
-
-  auto handleProtoComp = [&](ProtocolCompositionType *comp) -> void {
-    for (auto ty : comp->getMembers())
-      handleInheritedType(ty);
-  };
-
-  handleInheritedType = [&](Type ty) -> void {
-    if (auto *proto = ty->getAs<ProtocolType>())
-      handleProto(proto);
-    else if (auto *comp = ty->getAs<ProtocolCompositionType>())
-      handleProtoComp(comp);
-  };
-
-  for (auto loc : inheritedTypeLocs) {
-    if (loc.getTypeRepr())
-      handleInheritedType(
-          TypeResolution::forStructural(cast<DeclContext>(decl), None,
-                                        /*unboundTyOpener*/ nullptr,
-                                        /*placeholderHandler*/ nullptr)
-              .resolveType(loc.getTypeRepr()));
-    else
-      handleInheritedType(loc.getType());
-  }
-}
-
 /// Return associated `TangentVector` struct for a nominal type, if it exists.
 /// If not, synthesize the struct.
 static StructDecl *
@@ -409,12 +364,14 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
   // Note that, for example, this will always find `AdditiveArithmetic` and `Differentiable` because
   // the `Differentiable` protocol itself requires that its `TangentVector` conforms to
   // `AdditiveArithmetic` and `Differentiable`.
-  llvm::SmallPtrSet<ProtocolDecl *, 4> tvDesiredProtos;
-  llvm::SmallPtrSet<ProtocolDecl *, 4> conformanceInheritedProtos;
-  getInheritedProtocols(derived.ConformanceDecl, conformanceInheritedProtos);
+  llvm::SmallSetVector<ProtocolDecl *, 4> tvDesiredProtos;
+
   auto *diffableProto = C.getProtocol(KnownProtocolKind::Differentiable);
   auto *tvAssocType = diffableProto->getAssociatedType(C.Id_TangentVector);
-  for (auto proto : conformanceInheritedProtos) {
+
+  auto localProtos = cast<IterableDeclContext>(derived.ConformanceDecl)
+      ->getLocalProtocols();
+  for (auto proto : localProtos) {
     for (auto req : proto->getRequirementSignature()) {
       if (req.getKind() != RequirementKind::Conformance)
         continue;
@@ -516,19 +473,13 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
   auto *tangentEqualsSelfAlias = new (C) TypeAliasDecl(
       SourceLoc(), SourceLoc(), C.Id_TangentVector, SourceLoc(),
       /*GenericParams*/ nullptr, structDecl);
-  tangentEqualsSelfAlias->setUnderlyingType(structDecl->getSelfTypeInContext());
-  tangentEqualsSelfAlias->setAccess(structDecl->getFormalAccess());
+  tangentEqualsSelfAlias->setUnderlyingType(structDecl->getDeclaredInterfaceType());
+  tangentEqualsSelfAlias->copyFormalAccessFrom(structDecl,
+                                               /*sourceIsParentContext*/ true);
   tangentEqualsSelfAlias->setImplicit();
   tangentEqualsSelfAlias->setSynthesized();
   structDecl->addMember(tangentEqualsSelfAlias);
 
-  // If nominal type is `@usableFromInline`, also mark `TangentVector` struct.
-  if (nominal->getAttrs().hasAttribute<UsableFromInlineAttr>()) {
-    structDecl->getAttrs().add(new (C) UsableFromInlineAttr(/*implicit*/ true));
-    tangentEqualsSelfAlias->getAttrs().add(
-        new (C) UsableFromInlineAttr(/*implicit*/ true));
-  }
-
   // The implicit memberwise constructor must be explicitly created so that it
   // can called in `AdditiveArithmetic` and `Differentiable` methods. Normally,
   // the memberwise constructor is synthesized during SILGen, which is too late.
@@ -539,6 +490,9 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
     member->setImplicit();
 
   derived.addMembersToConformanceContext({structDecl});
+
+  TypeChecker::checkConformancesInContext(structDecl);
+
   return structDecl;
 }
 
diff --git a/lib/Sema/DerivedConformances.cpp b/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 {
diff --git a/lib/Sema/TypeChecker.cpp b/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();
 }
diff --git a/test/IRGen/enum_derived.swift b/test/IRGen/enum_derived.swift
@@ -22,15 +22,6 @@ enum E {
 // CHECK: %2 = icmp eq i8 %0, %1
 // CHECK: ret i1 %2
 
-// Check for the presence of the hashValue getter, calling Hasher.init() and
-// Hasher.finalize().
-
-// CHECK-NORMAL-LABEL:define hidden swiftcc i{{.*}} @"$s12enum_derived1EO9hashValueSivg"(i8 %0)
-// CHECK-TESTABLE-LABEL:define{{( dllexport)?}}{{( protected)?}} swiftcc i{{.*}} @"$s12enum_derived1EO9hashValueSivg"(i8 %0)
-// CHECK: call swiftcc void @"$ss6HasherV5_seedABSi_tcfC"(%Ts6HasherV* {{.*}})
-// CHECK: call swiftcc i{{[0-9]+}} @"$ss6HasherV9_finalizeSiyF"(%Ts6HasherV* {{.*}})
-// CHECK: ret i{{[0-9]+}} %{{[0-9]+}}
-
 // Check if the hash(into:) method can be compiled to a simple zext instruction
 // followed by a call to Hasher._combine(_:).
 
@@ -40,6 +31,15 @@ enum E {
 // CHECK: tail call swiftcc void @"$ss6HasherV8_combineyySuF"(i{{.*}} [[V]], %Ts6HasherV*
 // CHECK: ret void
 
+// Check for the presence of the hashValue getter, calling Hasher.init() and
+// Hasher.finalize().
+
+// CHECK-NORMAL-LABEL:define hidden swiftcc i{{.*}} @"$s12enum_derived1EO9hashValueSivg"(i8 %0)
+// CHECK-TESTABLE-LABEL:define{{( dllexport)?}}{{( protected)?}} swiftcc i{{.*}} @"$s12enum_derived1EO9hashValueSivg"(i8 %0)
+// CHECK: call swiftcc void @"$ss6HasherV5_seedABSi_tcfC"(%Ts6HasherV* {{.*}})
+// CHECK: call swiftcc i{{[0-9]+}} @"$ss6HasherV9_finalizeSiyF"(%Ts6HasherV* {{.*}})
+// CHECK: ret i{{[0-9]+}} %{{[0-9]+}}
+
 // Derived conformances from extensions
 // The actual enums are in Inputs/def_enum.swift
 
diff --git a/test/SILGen/property_wrappers.swift b/test/SILGen/property_wrappers.swift
@@ -84,16 +84,6 @@ func forceHasMemberwiseInit() {
 // CHECK: function_ref @$sSb22_builtinBooleanLiteralSbBi1__tcfC : $@convention(method) (Builtin.Int1, @thin Bool.Type) -> Bool
 // CHECK: return {{%.*}} : $Bool
 
-// default argument 0 of HasMemberwiseInit.init(x:y:z:)
-// CHECK: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA_ : $@convention(thin) <T where T : DefaultInit> () -> Wrapper<Bool> 
-
-// default argument 1 of HasMemberwiseInit.init(x:y:z:)
-// CHECK: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA0_ : $@convention(thin) <T where T : DefaultInit> () -> @out T {
-
-// default argument 2 of HasMemberwiseInit.init(x:y:z:)
-// CHECK: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA1_ : $@convention(thin) <T where T : DefaultInit> () -> WrapperWithInitialValue<Int> {
-
-
 // HasMemberwiseInit.init()
 // CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitVACyxGycfC : $@convention(method) <T where T : DefaultInit> (@thin HasMemberwiseInit<T>.Type) -> @out HasMemberwiseInit<T> {
 
@@ -119,6 +109,17 @@ func forceHasMemberwiseInit() {
 
 // CHECK: return
 
+
+// default argument 0 of HasMemberwiseInit.init(x:y:z:)
+// CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA_ : $@convention(thin) <T where T : DefaultInit> () -> Wrapper<Bool> 
+
+// default argument 1 of HasMemberwiseInit.init(x:y:z:)
+// CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA0_ : $@convention(thin) <T where T : DefaultInit> () -> @out T {
+
+// default argument 2 of HasMemberwiseInit.init(x:y:z:)
+// CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers17HasMemberwiseInitV1x1y1zACyxGAA7WrapperVySbG_xAA0F16WithInitialValueVySiGtcfcfA1_ : $@convention(thin) <T where T : DefaultInit> () -> WrapperWithInitialValue<Int> {
+
+
 // Non-generic struct with private property wrapper
 struct HasMemberwiseInitWithPrivateWrapper {
   @WrapperWithInitialValue
@@ -412,7 +413,7 @@ struct CompositionMembers {
   // CHECK-LABEL: sil hidden [transparent] [ossa] @$s17property_wrappers18CompositionMembersV3_p233_{{.*}}8WrapperAVyAA0N1BVyAA0N1CVySSGGGvpfi : $@convention(thin) () -> @owned Optional<String> {
   // CHECK: %0 = string_literal utf8 "Hello"
 
-  // CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers18CompositionMembersV2p12p2ACSiSg_SSSgtcfC : $@convention(method) (Optional<Int>, @owned Optional<String>, @thin CompositionMembers.Type) -> @owned CompositionMembers
+  // CHECK-LABEL: sil hidden [ossa] @$s17property_wrappers18CompositionMembersV2p12p2ACSiSg_SSSgtcfcfA0_ : $@convention(thin) () -> @owned Optional<String> {
   // CHECK: s17property_wrappers18CompositionMembersV3_p233_{{.*}}8WrapperAVyAA0N1BVyAA0N1CVySSGGGvpfi
 
 }
diff --git a/test/SILGen/synthesized_conformance_class.swift b/test/SILGen/synthesized_conformance_class.swift
@@ -55,12 +55,12 @@ class Nonfinal<T> {
 // Make sure that CodingKeys members are actually emitted.
 
 // CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}21__derived_enum_equalsySbAFyx_G_AHtFZ : $@convention(method) <T> (Final<T>.CodingKeys, Final<T>.CodingKeys, @thin Final<T>.CodingKeys.Type) -> Bool {
-// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}9hashValueSivg : $@convention(method) <T> (Final<T>.CodingKeys) -> Int {
 // CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}4hash4intoys6HasherVz_tF : $@convention(method) <T> (@inout Hasher, Final<T>.CodingKeys) -> () {
-// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}11stringValueSSvg : $@convention(method) <T> (Final<T>.CodingKeys) -> @owned String {
 // CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}11stringValueAFyx_GSgSS_tcfC : $@convention(method) <T> (@owned String, @thin Final<T>.CodingKeys.Type) -> Optional<Final<T>.CodingKeys> {
-// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}8intValueSiSgvg : $@convention(method) <T> (Final<T>.CodingKeys) -> Optional<Int> {
 // CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}8intValueAFyx_GSgSi_tcfC : $@convention(method) <T> (Int, @thin Final<T>.CodingKeys.Type) -> Optional<Final<T>.CodingKeys> {
+// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}9hashValueSivg : $@convention(method) <T> (Final<T>.CodingKeys) -> Int {
+// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}8intValueSiSgvg : $@convention(method) <T> (Final<T>.CodingKeys) -> Optional<Int> {
+// CHECK-LABEL: sil private [ossa] @$s29synthesized_conformance_class5FinalC10CodingKeys{{.*}}11stringValueSSvg : $@convention(method) <T> (Final<T>.CodingKeys) -> @owned String {
 
 extension Final: Encodable where T: Encodable {}
 // CHECK-LABEL: // Final<A>.encode(to:)
diff --git a/test/SILGen/synthesized_conformance_enum.swift b/test/SILGen/synthesized_conformance_enum.swift
diff --git a/test/SILGen/synthesized_conformance_struct.swift b/test/SILGen/synthesized_conformance_struct.swift
diff --git a/test/Sema/enum_conformance_synthesis.swift b/test/Sema/enum_conformance_synthesis.swift
diff --git a/test/Sema/enum_raw_representable.swift b/test/Sema/enum_raw_representable.swift
