Remove the ability to reference instances of TypeChecker

CodaFi · CodaFi · commit c3c490efb011 · 2020-03-16T19:19:02.000-07:00
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -445,15 +445,7 @@ class ASTContext final {
 private:
   friend class TypeChecker;
 
-  void installGlobalTypeChecker(TypeChecker *TC);
 public:
-  /// Returns if semantic AST queries are enabled. This generally means module
-  /// loading and name lookup can take place.
-  bool areSemanticQueriesEnabled() const;
-
-  /// Retrieve the global \c TypeChecker instance associated with this context.
-  TypeChecker *getLegacyGlobalTypeChecker() const;
-
   /// getIdentifier - Return the uniqued and AST-Context-owned version of the
   /// specified string.
   Identifier getIdentifier(StringRef Str) const;
diff --git a/include/swift/AST/LookupKinds.h b/include/swift/AST/LookupKinds.h
@@ -62,12 +62,15 @@ enum NLOptions : unsigned {
   /// Include synonyms declared with @_implements()
   NL_IncludeAttributeImplements = 0x100,
 
+  /// Synthesize property wrappers and include them in the lookup results.
+  NL_IncludePropertyWrappers = 0x200,
+
   /// This lookup is known to not add any additional dependencies to the
   /// primary source file.
   ///
   /// \see NL_KnownDependencyMask
   NL_KnownNoDependency =
-      NL_KnownNonCascadingDependency|NL_KnownCascadingDependency,
+      NL_KnownNonCascadingDependency | NL_KnownCascadingDependency,
 
   /// A mask of all options controlling how a lookup should be recorded as a
   /// dependency.
@@ -83,10 +86,12 @@ enum NLOptions : unsigned {
   ///
   /// FIXME: Eventually, add NL_ProtocolMembers to this, once all of the
   /// callers can handle it.
-  NL_QualifiedDefault = NL_RemoveNonVisible | NL_RemoveOverridden,
+  NL_QualifiedDefault =
+      NL_RemoveNonVisible | NL_RemoveOverridden | NL_IncludePropertyWrappers,
 
   /// The default set of options used for unqualified name lookup.
-  NL_UnqualifiedDefault = NL_RemoveNonVisible | NL_RemoveOverridden
+  NL_UnqualifiedDefault =
+      NL_RemoveNonVisible | NL_RemoveOverridden | NL_IncludePropertyWrappers,
 };
 
 static inline NLOptions operator|(NLOptions lhs, NLOptions rhs) {
diff --git a/include/swift/Subsystems.h b/include/swift/Subsystems.h
@@ -145,7 +145,7 @@ namespace swift {
   /// doesn't already have one.
   ///
   /// \returns a reference to the type checker instance.
-  TypeChecker &createTypeChecker(ASTContext &Ctx);
+  void createTypeChecker(ASTContext &Ctx);
 
   /// Bind all 'extension' visible from \p SF to the extended nominal.
   void bindExtensions(SourceFile &SF);
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -155,9 +155,6 @@ struct ASTContext::Implementation {
   /// The set of cleanups to be called when the ASTContext is destroyed.
   std::vector<std::function<void(void)>> Cleanups;
 
-  /// A global type checker instance..
-  TypeChecker *Checker = nullptr;
-
   // FIXME: This is a StringMap rather than a StringSet because StringSet
   // doesn't allow passing in a pre-existing allocator.
   llvm::StringMap<Identifier::Aligner, llvm::BumpPtrAllocator&>
@@ -632,19 +629,6 @@ RC<syntax::SyntaxArena> ASTContext::getSyntaxArena() const {
   return getImpl().TheSyntaxArena;
 }
 
-bool ASTContext::areSemanticQueriesEnabled() const {
-  return getLegacyGlobalTypeChecker() != nullptr;
-}
-
-TypeChecker *ASTContext::getLegacyGlobalTypeChecker() const {
-  return getImpl().Checker;
-}
-
-void ASTContext::installGlobalTypeChecker(TypeChecker *TC) {
-  assert(!getImpl().Checker);
-  getImpl().Checker = TC;
-}
-
 /// getIdentifier - Return the uniqued and AST-Context-owned version of the
 /// specified string.
 Identifier ASTContext::getIdentifier(StringRef Str) const {
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -2998,8 +2998,6 @@ bool ValueDecl::isRecursiveValidation() const {
 Type ValueDecl::getInterfaceType() const {
   auto &ctx = getASTContext();
 
-  assert(ctx.areSemanticQueriesEnabled());
-
   if (auto type =
           evaluateOrDefault(ctx.evaluator,
                             InterfaceTypeRequest{const_cast<ValueDecl *>(this)},
@@ -5813,10 +5811,6 @@ StaticSpellingKind AbstractStorageDecl::getCorrectStaticSpelling() const {
 
 llvm::TinyPtrVector<CustomAttr *> VarDecl::getAttachedPropertyWrappers() const {
   auto &ctx = getASTContext();
-  if (!ctx.areSemanticQueriesEnabled()) {
-    return { };
-  }
-
   auto mutableThis = const_cast<VarDecl *>(this);
   return evaluateOrDefault(ctx.evaluator,
                            AttachedPropertyWrappersRequest{mutableThis},
@@ -6786,7 +6780,7 @@ ObjCSelector
 AbstractFunctionDecl::getObjCSelector(DeclName preferredName,
                                       bool skipIsObjCResolution) const {
   // FIXME: Forces computation of the Objective-C selector.
-  if (getASTContext().areSemanticQueriesEnabled() && !skipIsObjCResolution)
+  if (!skipIsObjCResolution)
     (void)isObjC();
 
   // If there is an @objc attribute with a name, use that name.
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -1612,8 +1612,8 @@ QualifiedLookupRequest::evaluate(Evaluator &eval, const DeclContext *DC,
 
   // Visit all of the nominal types we know about, discovering any others
   // we need along the way.
-  auto &ctx = DC->getASTContext();
   bool wantProtocolMembers = (options & NL_ProtocolMembers);
+  const bool includesPropertyWrappers = (options & NL_IncludePropertyWrappers);
   while (!stack.empty()) {
     auto current = stack.back();
     stack.pop_back();
@@ -1622,7 +1622,7 @@ QualifiedLookupRequest::evaluate(Evaluator &eval, const DeclContext *DC,
       tracker->addUsedMember({current, member.getBaseName()},isLookupCascading);
 
     // Make sure we've resolved property wrappers, if we need them.
-    if (ctx.areSemanticQueriesEnabled()) {
+    if (includesPropertyWrappers) {
       installPropertyWrapperMembersIfNeeded(current, member);
     }
 
diff --git a/lib/Sema/CSGen.cpp b/lib/Sema/CSGen.cpp
@@ -4405,7 +4405,6 @@ getMemberDecls(InterestedMemberKind Kind) {
 ResolvedMemberResult
 swift::resolveValueMember(DeclContext &DC, Type BaseTy, DeclName Name) {
   ResolvedMemberResult Result;
-  assert(DC.getASTContext().areSemanticQueriesEnabled());
   ConstraintSystem CS(&DC, None);
 
   // Look up all members of BaseTy with the given Name.
diff --git a/lib/Sema/TypeCheckPropertyWrapper.cpp b/lib/Sema/TypeCheckPropertyWrapper.cpp
@@ -498,9 +498,6 @@ AttachedPropertyWrapperTypeRequest::evaluate(Evaluator &evaluator,
     return Type();
 
   ASTContext &ctx = var->getASTContext();
-  if (!ctx.areSemanticQueriesEnabled())
-    return nullptr;
-
   auto resolution =
       TypeResolution::forContextual(var->getDeclContext());
   TypeResolutionOptions options(TypeResolverContext::PatternBindingDecl);
@@ -533,10 +530,6 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate(
   if (!binding)
     return Type();
 
-  ASTContext &ctx = var->getASTContext();
-  if (!ctx.areSemanticQueriesEnabled())
-    return Type();
-
   // If there's an initializer of some sort, checking it will determine the
   // property wrapper type.
   unsigned index = binding->getPatternEntryIndexForVarDecl(var);
@@ -546,6 +539,7 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate(
     if (!binding->isInitializerChecked(index))
       TypeChecker::typeCheckPatternBinding(binding, index);
 
+    auto &ctx = var->getASTContext();
     Type type = ctx.getSideCachedPropertyWrapperBackingPropertyType(var);
     assert(type || ctx.Diags.hadAnyError());
     return type;
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
@@ -53,15 +53,6 @@
 
 using namespace swift;
 
-TypeChecker &TypeChecker::createForContext(ASTContext &ctx) {
-  assert(!ctx.getLegacyGlobalTypeChecker() &&
-         "Cannot install more than one instance of the global type checker!");
-  auto *TC = new TypeChecker();
-  ctx.installGlobalTypeChecker(TC);
-  ctx.addCleanup([=](){ delete TC; });
-  return *ctx.getLegacyGlobalTypeChecker();
-}
-
 ProtocolDecl *TypeChecker::getProtocol(ASTContext &Context, SourceLoc loc,
                                        KnownProtocolKind kind) {
   auto protocol = Context.getProtocol(kind);
@@ -346,7 +337,7 @@ TypeCheckSourceFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
   BufferIndirectlyCausingDiagnosticRAII cpr(*SF);
 
   // Make sure we have a type checker.
-  TypeChecker &TC = createTypeChecker(Ctx);
+  createTypeChecker(Ctx);
 
   // Make sure that name binding has been completed before doing any type
   // checking.
@@ -537,7 +528,6 @@ bool swift::performTypeLocChecking(ASTContext &Ctx, TypeLoc &T,
   Optional<DiagnosticSuppression> suppression;
   if (!ProduceDiagnostics)
     suppression.emplace(Ctx.Diags);
-  assert(Ctx.areSemanticQueriesEnabled());
   return TypeChecker::validateType(Ctx, T, resolution, options);
 }
 
@@ -675,11 +665,7 @@ bool swift::typeCheckTopLevelCodeDecl(TopLevelCodeDecl *TLCD) {
   return true;
 }
 
-TypeChecker &swift::createTypeChecker(ASTContext &Ctx) {
-  if (auto *TC = Ctx.getLegacyGlobalTypeChecker())
-    return *TC;
-  return TypeChecker::createForContext(Ctx);
-}
+void swift::createTypeChecker(ASTContext &Ctx) {}
 
 void TypeChecker::checkForForbiddenPrefix(ASTContext &C, DeclBaseName Name) {
   if (C.TypeCheckerOpts.DebugForbidTypecheckPrefix.empty())
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
@@ -411,13 +411,6 @@ class TypeChecker final {
 
   friend class ASTContext;
 
-public:
-  /// Create a new type checker instance for the given ASTContext, if it
-  /// doesn't already have one.
-  ///
-  /// \returns a reference to the type checker.
-  static TypeChecker &createForContext(ASTContext &ctx);
-
 public:
   TypeChecker(const TypeChecker&) = delete;
   TypeChecker& operator=(const TypeChecker&) = delete;
