AST: Remove ASTContext::ExternalDefinitions

slavapestov · slavapestov · commit ec1b1a390a9d · 2019-05-28T22:08:30.000-04:00
Anything added here has a type checked body now, so it no longer
serves any purpose.
diff --git a/docs/CompilerPerformance.md b/docs/CompilerPerformance.md
@@ -717,7 +717,6 @@ $ cat /tmp/stats/*.json
   "AST.NumSourceLinesPerSecond": 3,
   "AST.NumLinkLibraries": 0,
   "AST.NumLoadedModules": 4,
-  "AST.NumImportedExternalDefinitions": 0,
   "AST.NumTotalClangImportedEntities": 0,
   ...
   "time.swift.Parsing.wall": 5.038023e-03,
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -255,13 +255,6 @@ class ASTContext final {
 #define IDENTIFIER_WITH_NAME(Name, IdStr) Identifier Id_##Name;
 #include "swift/AST/KnownIdentifiers.def"
 
-  /// The list of external definitions imported by this context.
-  llvm::SetVector<Decl *> ExternalDefinitions;
-
-  /// FIXME: HACK HACK HACK
-  /// This state should be tracked somewhere else.
-  unsigned LastCheckedExternalDefinition = 0;
-
   /// A consumer of type checker debug output.
   std::unique_ptr<TypeCheckerDebugConsumer> TypeCheckerDebug;
 
@@ -580,14 +573,8 @@ class ASTContext final {
                                ForeignLanguage language,
                                const DeclContext *dc);
 
-  /// Add a declaration to a list of declarations that need to be emitted
-  /// as part of the current module or source file, but are otherwise not
-  /// nested within it.
-  void addExternalDecl(Decl *decl);
-
   /// Add a declaration that was synthesized to a per-source file list if
-  /// if is part of a source file, or the external declarations list if
-  /// it is part of an imported type context.
+  /// if is part of a source file.
   void addSynthesizedDecl(Decl *decl);
 
   /// Add a cleanup function to be called when the ASTContext is deallocated.
diff --git a/include/swift/Basic/Statistics.def b/include/swift/Basic/Statistics.def
@@ -105,9 +105,6 @@ FRONTEND_STATISTIC(AST, NumLinkLibraries)
 /// Number of top-level modules loaded in the AST context.
 FRONTEND_STATISTIC(AST, NumLoadedModules)
 
-/// Number of external definitions imported into the AST context.
-FRONTEND_STATISTIC(AST, NumImportedExternalDefinitions)
-
 /// Number of Clang entities imported into the AST context.
 FRONTEND_STATISTIC(AST, NumTotalClangImportedEntities)
 
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -1362,20 +1362,10 @@ bool ASTContext::hasArrayLiteralIntrinsics() const {
     && getDeallocateUninitializedArray();
 }
 
-void ASTContext::addExternalDecl(Decl *decl) {
-  ExternalDefinitions.insert(decl);
-}
-
 void ASTContext::addSynthesizedDecl(Decl *decl) {
-  auto *mod = cast<FileUnit>(decl->getDeclContext()->getModuleScopeContext());
-  if (mod->getKind() == FileUnitKind::ClangModule ||
-      mod->getKind() == FileUnitKind::DWARFModule ||
-      mod->getKind() == FileUnitKind::SerializedAST) {
-    ExternalDefinitions.insert(decl);
-    return;
-  }
-
-  cast<SourceFile>(mod)->SynthesizedDecls.push_back(decl);
+  auto *fileUnit = decl->getDeclContext()->getModuleScopeContext();
+  if (auto *sf = dyn_cast<SourceFile>(fileUnit))
+    sf->SynthesizedDecls.push_back(decl);
 }
 
 void ASTContext::addCleanup(std::function<void(void)> cleanup) {
@@ -2050,7 +2040,6 @@ ASTContext::takeDelayedConformanceDiags(NormalProtocolConformance *conformance){
 size_t ASTContext::getTotalMemory() const {
   size_t Size = sizeof(*this) +
     // LoadedModules ?
-    // ExternalDefinitions ?
     llvm::capacity_in_bytes(CanonicalGenericTypeParamTypeNames) +
     // RemappedTypes ?
     sizeof(getImpl()) +
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -538,9 +538,7 @@ makeEnumRawValueConstructor(ClangImporter::Implementation &Impl,
   
   ctorDecl->setBody(body);
   ctorDecl->setBodyTypeCheckedIfPresent();
-  
-  Impl.registerExternalDecl(ctorDecl);
-  
+
   return ctorDecl;
 }
 
@@ -616,7 +614,7 @@ static AccessorDecl *makeEnumRawValueGetter(ClangImporter::Implementation &Impl,
   
   getterDecl->setBody(body);
   getterDecl->setBodyTypeCheckedIfPresent();
-  Impl.registerExternalDecl(getterDecl);
+
   return getterDecl;
 }
 
@@ -694,7 +692,6 @@ static AccessorDecl *makeStructRawValueGetter(
   getterDecl->setBody(body);
   getterDecl->setBodyTypeCheckedIfPresent();
 
-  Impl.registerExternalDecl(getterDecl);
   return getterDecl;
 }
 
@@ -854,7 +851,6 @@ makeIndirectFieldAccessors(ClangImporter::Implementation &Impl,
     getterDecl->setBody(body);
     getterDecl->setBodyTypeCheckedIfPresent();
     getterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
-    Impl.registerExternalDecl(getterDecl);
   }
 
   // Synthesize the setter body
@@ -886,7 +882,6 @@ makeIndirectFieldAccessors(ClangImporter::Implementation &Impl,
     setterDecl->setBody(body);
     setterDecl->setBodyTypeCheckedIfPresent();
     setterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
-    Impl.registerExternalDecl(setterDecl);
   }
 
   return { getterDecl, setterDecl };
@@ -964,7 +959,6 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
     getterDecl->setBody(body);
     getterDecl->setBodyTypeCheckedIfPresent();
     getterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
-    Impl.registerExternalDecl(getterDecl);
   }
 
   // Synthesize the setter body
@@ -1026,7 +1020,6 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
     setterDecl->setBody(body);
     setterDecl->setBodyTypeCheckedIfPresent();
     setterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
-    Impl.registerExternalDecl(setterDecl);
   }
 
   return { getterDecl, setterDecl };
@@ -1160,8 +1153,6 @@ makeBitFieldAccessors(ClangImporter::Implementation &Impl,
                                                    cGetterExpr,
                                                    nullptr);
     cGetterDecl->setBody(cGetterBody);
-
-    Impl.registerExternalDecl(getterDecl);
   }
 
   // Synthesize the setter body
@@ -1218,8 +1209,6 @@ makeBitFieldAccessors(ClangImporter::Implementation &Impl,
                                                        clang::FPOptions());
     
     cSetterDecl->setBody(cSetterExpr);
-
-    Impl.registerExternalDecl(setterDecl);
   }
 
   return { getterDecl, setterDecl };
@@ -1296,9 +1285,6 @@ createDefaultConstructor(ClangImporter::Implementation &Impl,
   constructor->setBody(body);
   constructor->setBodyTypeCheckedIfPresent();
 
-  // Add this as an external definition.
-  Impl.registerExternalDecl(constructor);
-
   // We're done.
   return constructor;
 }
@@ -1419,9 +1405,6 @@ createValueConstructor(ClangImporter::Implementation &Impl,
     constructor->setBodyTypeCheckedIfPresent();
   }
 
-  // Add this as an external definition.
-  Impl.registerExternalDecl(constructor);
-
   // We're done.
   return constructor;
 }
@@ -1930,8 +1913,7 @@ static bool addErrorDomain(NominalTypeDecl *swiftDecl,
   getterDecl->setBody(
       BraceStmt::create(C, SourceLoc(), {ret}, SourceLoc(), isImplicit));
   getterDecl->setBodyTypeCheckedIfPresent();
-  
-  importer.registerExternalDecl(getterDecl);
+
   return true;
 }
 
@@ -3080,12 +3062,6 @@ namespace {
         }
       }
 
-      // Add the type decl to ExternalDefinitions so that we can type-check
-      // raw values and SILGen can emit witness tables for derived conformances.
-      // FIXME: There might be better ways to do this.
-      Impl.registerExternalDecl(result);
-      if (errorWrapper)
-        Impl.registerExternalDecl(errorWrapper);
       return result;
     }
 
@@ -3327,11 +3303,6 @@ namespace {
 
       result->setHasUnreferenceableStorage(hasUnreferenceableStorage);
 
-      // Add the struct decl to ExternalDefinitions so that IRGen can emit
-      // metadata for it.
-      // FIXME: There might be better ways to do this.
-      Impl.registerExternalDecl(result);
-
       return result;
     }
 
@@ -3644,14 +3615,6 @@ namespace {
 
     void finishFuncDecl(const clang::FunctionDecl *decl,
                         AbstractFunctionDecl *result) {
-      // Keep track of inline function bodies so that we can generate
-      // IR from them using Clang's IR generator.
-      if ((decl->isInlined() || decl->hasAttr<clang::AlwaysInlineAttr>() ||
-           !decl->isExternallyVisible()) &&
-          decl->hasBody()) {
-        Impl.registerExternalDecl(result);
-      }
-
       // Set availability.
       if (decl->isVariadic()) {
         Impl.markUnavailable(result, "Variadic function is unavailable");
@@ -3819,9 +3782,6 @@ namespace {
         result->getAttrs().add(new (Impl.SwiftContext)
                                  FinalAttr(/*IsImplicit=*/true));
 
-      if (!decl->hasExternalStorage())
-        Impl.registerExternalDecl(result);
-
       // If this is a compatibility stub, mark it as such.
       if (correctSwiftName)
         markAsVariant(result, *correctSwiftName);
@@ -4533,11 +4493,6 @@ namespace {
 
       result->setMemberLoader(&Impl, 0);
 
-      // Add the protocol decl to ExternalDefinitions so that IRGen can emit
-      // metadata for it.
-      // FIXME: There might be better ways to do this.
-      Impl.registerExternalDecl(result);
-
       return result;
     }
 
@@ -5149,7 +5104,6 @@ SwiftDeclConverter::importCFClassType(const clang::TypedefNameDecl *decl,
   theClass->setAddedImplicitInitializers(); // suppress all initializers
   theClass->setForeignClassKind(ClassDecl::ForeignKind::CFType);
   addObjCAttribute(theClass, None);
-  Impl.registerExternalDecl(theClass);
 
   if (superclass) {
     SmallVector<TypeLoc, 4> inheritedTypes;
@@ -5438,7 +5392,6 @@ SwiftDeclConverter::importSwiftNewtype(const clang::TypedefNameDecl *decl,
   }
 
   Impl.ImportedDecls[{decl->getCanonicalDecl(), getVersion()}] = structDecl;
-  Impl.registerExternalDecl(structDecl);
   return structDecl;
 }
 
@@ -6341,9 +6294,6 @@ ConstructorDecl *SwiftDeclConverter::importConstructor(
   // If this constructor overrides another constructor, mark it as such.
   recordObjCOverride(result);
 
-  // Inform the context that we have external definitions.
-  Impl.registerExternalDecl(result);
-
   return result;
 }
 
@@ -8400,9 +8350,6 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
   // Set the function up as the getter.
   makeComputed(var, func, nullptr);
 
-  // Register this thunk as an external definition.
-  registerExternalDecl(func);
-
   return var;
 }
 
diff --git a/lib/ClangImporter/ImporterImpl.h b/lib/ClangImporter/ImporterImpl.h
@@ -606,11 +606,6 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
   bool shouldIgnoreBridgeHeaderTopLevelDecl(clang::Decl *D);
 
 public:
-  void registerExternalDecl(Decl *D) {
-    if (!hasFinishedTypeChecking())
-      SwiftContext.addExternalDecl(D);
-  }
-
   void recordImplicitUnwrapForDecl(Decl *decl, bool isIUO) {
 #if !defined(NDEBUG)
     Type ty;
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -509,7 +509,6 @@ static void countStatsPostSema(UnifiedStatsReporter &Stats,
 
   auto const &AST = Instance.getASTContext();
   C.NumLoadedModules = AST.LoadedModules.size();
-  C.NumImportedExternalDefinitions = AST.ExternalDefinitions.size();
 
   if (auto *D = Instance.getDependencyTracker()) {
     C.NumDependencies = D->getDependencies().size();
diff --git a/lib/Sema/CodeSynthesis.cpp b/lib/Sema/CodeSynthesis.cpp
@@ -1307,11 +1307,6 @@ void TypeChecker::synthesizeWitnessAccessorsForStorage(
       assert(!accessor->hasBody());
       accessor->setBodySynthesizer(&synthesizeAccessorBody);
 
-      // Make sure SILGen emits the accessor; on-demand accessors have shared
-      // linkage, and if its defined in a different translation unit from the
-      // conformance we cannot simply generate an external declaration.
-      Context.addExternalDecl(accessor);
-
       maybeMarkTransparent(accessor, Context);
       DeclsToFinalize.insert(accessor);
     }
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
@@ -294,7 +294,6 @@ static void bindExtensions(SourceFile &SF, TypeChecker &TC) {
 
 static void typeCheckFunctionsAndExternalDecls(SourceFile &SF, TypeChecker &TC) {
   unsigned currentFunctionIdx = 0;
-  unsigned currentExternalDef = TC.Context.LastCheckedExternalDefinition;
   unsigned currentSynthesizedDecl = SF.LastCheckedSynthesizedDecl;
   do {
     // Type check conformance contexts.
@@ -323,24 +322,6 @@ static void typeCheckFunctionsAndExternalDecls(SourceFile &SF, TypeChecker &TC)
       TC.typeCheckAbstractFunctionBody(AFD);
     }
 
-    // Type check external definitions.
-    for (unsigned n = TC.Context.ExternalDefinitions.size();
-         currentExternalDef != n;
-         ++currentExternalDef) {
-      auto decl = TC.Context.ExternalDefinitions[currentExternalDef];
-
-      if (auto *AFD = dyn_cast<AbstractFunctionDecl>(decl)) {
-        TC.typeCheckAbstractFunctionBody(AFD);
-        TC.checkFunctionErrorHandling(AFD);
-        continue;
-      }
-      if (isa<NominalTypeDecl>(decl))
-        continue;
-      if (isa<VarDecl>(decl))
-        continue;
-      llvm_unreachable("Unhandled external definition kind");
-    }
-
     // Validate any referenced declarations for SIL's purposes.
     // Note: if we ever start putting extension members in vtables, we'll need
     // to validate those members too.
@@ -384,15 +365,13 @@ static void typeCheckFunctionsAndExternalDecls(SourceFile &SF, TypeChecker &TC)
     TC.UsedConformances.clear();
 
   } while (currentFunctionIdx < TC.definedFunctions.size() ||
-           currentExternalDef < TC.Context.ExternalDefinitions.size() ||
            currentSynthesizedDecl < SF.SynthesizedDecls.size() ||
            TC.NextDeclToFinalize < TC.DeclsToFinalize.size() ||
            !TC.ConformanceContexts.empty() ||
            !TC.UsedConformances.empty() ||
            !TC.PartiallyCheckedConformances.empty());
 
   // FIXME: Horrible hack. Store this somewhere more appropriate.
-  TC.Context.LastCheckedExternalDefinition = currentExternalDef;
   SF.LastCheckedSynthesizedDecl = currentSynthesizedDecl;
 
   // Now that all types have been finalized, run any delayed
