Do 'bindExtensions()' as a part of 'performParseAndNameBindingOnly()'

Author: rintaro

include/swift/Sema/IDETypeChecking.h

@@ -46,8 +46,6 @@ namespace swift {
   class ValueDecl;
   struct PrintOptions;
 
-  void bindExtensions(SourceFile &SF);
-
   /// Typecheck binding initializer at \p bindingIndex.
   void typeCheckPatternBinding(PatternBindingDecl *PBD, unsigned bindingIndex);
 

include/swift/Subsystems.h

@@ -199,6 +199,9 @@ namespace swift {
   /// \returns a reference to the type checker instance.
   TypeChecker &createTypeChecker(ASTContext &Ctx);
 
+  /// Bind all 'extension' visible from \p SF to the extended nominal.
+  void bindExtensions(SourceFile &SF);
+
   /// Once parsing and name-binding are complete, this walks the AST to resolve
   /// types and diagnose problems therein.
   ///

lib/Frontend/Frontend.cpp

@@ -843,18 +843,13 @@ void CompilerInstance::parseAndCheckTypesUpTo(
   }) && "some files have not yet had their imports resolved");
   MainModule->setHasResolvedImports();
 
-  // If the limiting AST stage is name binding, we're done.
-  if (limitStage <= SourceFile::NameBound) {
-    if (Invocation.isCodeCompletion()) {
-      performCodeCompletionSecondPass(*PersistentState.get(),
-                                      *Invocation.getCodeCompletionFactory());
-    }
-    return;
-  }
-  assert(!Invocation.isCodeCompletion());
-
   const auto &options = Invocation.getFrontendOptions();
   forEachFileToTypeCheck([&](SourceFile &SF) {
+    if (limitStage == SourceFile::NameBound) {
+      bindExtensions(SF);
+      return;
+    }
+
     performTypeChecking(SF, PersistentState->getTopLevelContext(),
                         TypeCheckOptions, /*curElem*/ 0,
                         options.WarnLongFunctionBodies,
@@ -875,6 +870,17 @@ void CompilerInstance::parseAndCheckTypesUpTo(
     }
   });
 
+  if (Invocation.isCodeCompletion()) {
+    assert(limitStage == SourceFile::NameBound);
+    performCodeCompletionSecondPass(*PersistentState.get(),
+                                    *Invocation.getCodeCompletionFactory());
+  }
+
+  // If the limiting AST stage is name binding, we're done.
+  if (limitStage <= SourceFile::NameBound) {
+    return;
+  }
+
   finishTypeChecking(TypeCheckOptions);
 }
 
@@ -986,6 +992,7 @@ void CompilerInstance::parseAndTypeCheckMainFileUpTo(
         llvm_unreachable("invalid limit stage");
       case SourceFile::NameBound:
         performNameBinding(MainFile, CurTUElem);
+        bindExtensions(MainFile);
         break;
       case SourceFile::TypeChecked:
         const auto &options = Invocation.getFrontendOptions();

lib/IDE/ExprContextAnalysis.cpp

@@ -91,12 +91,6 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
 } // anonymous namespace
 
 void swift::ide::typeCheckContextUntil(DeclContext *DC, SourceLoc Loc) {
-  // Lookup the swift module.  This ensures that we record all known
-  // protocols in the AST.
-  (void) DC->getASTContext().getStdlibModule();
-
-  bindExtensions(*DC->getParentSourceFile());
-
   while (isa<AbstractClosureExpr>(DC))
     DC = DC->getParent();
 

lib/Sema/TypeChecker.cpp

@@ -385,10 +385,6 @@ void swift::performTypeChecking(SourceFile &SF, TopLevelContext &TLC,
       if (!SF.getParentModule()->isOnoneSupportModule())
         TC.setSkipNonInlinableBodies(true);
 
-    // Lookup the swift module.  This ensures that we record all known
-    // protocols in the AST.
-    (void) TC.getStdlibModule(&SF);
-
     if (!Ctx.LangOpts.DisableAvailabilityChecking) {
       // Build the type refinement hierarchy for the primary
       // file before type checking.