Merge pull request swiftlang#31642 from slavapestov/sil-parser-astscope

SIL: Use ASTScope for SIL parsing

Author: slavapestov

include/swift/AST/SourceFile.h

@@ -595,8 +595,6 @@ class SourceFile final : public FileUnit {
 
   bool canBeParsedInFull() const;
 
-  bool isSuitableForASTScopes() const { return canBeParsedInFull(); }
-
   /// Whether the bodies of types and functions within this file can be lazily
   /// parsed.
   bool hasDelayedBodyParsing() const;

lib/AST/ASTScopeCreation.cpp

@@ -768,8 +768,7 @@ bool ASTScope::areInactiveIfConfigClausesSupported() {
 
 void ASTScope::expandFunctionBody(AbstractFunctionDecl *AFD) {
   auto *const SF = AFD->getParentSourceFile();
-  if (SF->isSuitableForASTScopes())
-    SF->getScope().expandFunctionBodyImpl(AFD);
+  SF->getScope().expandFunctionBodyImpl(AFD);
 }
 
 void ASTScope::expandFunctionBodyImpl(AbstractFunctionDecl *AFD) {

lib/AST/Module.cpp

@@ -2566,7 +2566,6 @@ StringRef SourceFile::getFilename() const {
 }
 
 ASTScope &SourceFile::getScope() {
-  assert(isSuitableForASTScopes() && "Should not be creating scope tree");
   if (!Scope)
     Scope = std::unique_ptr<ASTScope>(new (getASTContext()) ASTScope(this));
   return *Scope.get();

lib/AST/UnqualifiedLookup.cpp

@@ -571,8 +571,7 @@ bool UnqualifiedLookupFactory::wouldUseASTScopesForLookupIfItWereEnabled()
     const {
   if (!Loc.isValid())
     return false;
-  const auto *const SF = DC->getParentSourceFile();
-  return SF && SF->isSuitableForASTScopes();
+  return (bool) DC->getParentSourceFile();
 }
 
 #pragma mark context-based lookup definitions

lib/SIL/Parser/ParseSIL.cpp

@@ -184,8 +184,7 @@ namespace {
     std::function<void(Type)> ParsedTypeCallback;
 
     bool performTypeLocChecking(TypeLoc &T, bool IsSILType,
-                                GenericEnvironment *GenericEnv = nullptr,
-                                DeclContext *DC = nullptr);
+                                GenericEnvironment *GenericEnv = nullptr);
 
     void convertRequirements(SILFunction *F, ArrayRef<RequirementRepr> From,
                              SmallVectorImpl<Requirement> &To);
@@ -1105,19 +1104,13 @@ static bool parseDeclSILOptional(bool *isTransparent,
 }
 
 bool SILParser::performTypeLocChecking(TypeLoc &T, bool IsSILType,
-                                       GenericEnvironment *GenericEnv,
-                                       DeclContext *DC) {
+                                       GenericEnvironment *GenericEnv) {
   if (GenericEnv == nullptr)
     GenericEnv = ContextGenericEnv;
 
-  if (!DC)
-    DC = &P.SF;
-  else if (!GenericEnv)
-    GenericEnv = DC->getGenericEnvironmentOfContext();
-
   return swift::performTypeLocChecking(P.Context, T,
                                        /*isSILMode=*/true, IsSILType,
-                                       GenericEnv, DC);
+                                       GenericEnv, &P.SF);
 }
 
 /// Find the top-level ValueDecl or Module given a name.
@@ -1712,8 +1705,7 @@ bool SILParser::parseSubstitutions(SmallVectorImpl<ParsedSubstitution> &parsed,
     TypeLoc Ty = TyR.get();
     if (defaultForProto)
       bindProtocolSelfInTypeRepr(Ty, defaultForProto);
-    if (performTypeLocChecking(Ty, /*IsSILType=*/ false, GenericEnv,
-                               defaultForProto))
+    if (performTypeLocChecking(Ty, /*IsSILType=*/ false, GenericEnv))
       return true;
     parsed.push_back({Loc, Ty.getType()});
   } while (P.consumeIf(tok::comma));
@@ -6268,6 +6260,8 @@ ProtocolConformanceRef SILParser::parseProtocolConformance(
   auto *genericParams = P.maybeParseGenericParams().getPtrOrNull();
   if (genericParams) {
     genericEnv = handleSILGenericParams(genericParams, &P.SF);
+  } else if (defaultForProto) {
+    genericEnv = defaultForProto->getGenericEnvironment();
   }
 
   auto retVal = parseProtocolConformanceHelper(proto, genericEnv, context,
@@ -6291,8 +6285,7 @@ ProtocolConformanceRef SILParser::parseProtocolConformanceHelper(
     bindProtocolSelfInTypeRepr(Ty, defaultForProto);
   }
 
-  if (performTypeLocChecking(Ty, /*IsSILType=*/ false, witnessEnv,
-                             defaultForProto))
+  if (performTypeLocChecking(Ty, /*IsSILType=*/ false, witnessEnv))
     return ProtocolConformanceRef();
   auto ConformingTy = Ty.getType();
 

lib/Sema/TypeChecker.cpp

@@ -320,7 +320,7 @@ TypeCheckSourceFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
   // scope-based lookups. Only the top-level scopes because extensions have not
   // been bound yet.
   auto &Ctx = SF->getASTContext();
-  if (Ctx.LangOpts.EnableASTScopeLookup && SF->isSuitableForASTScopes())
+  if (Ctx.LangOpts.EnableASTScopeLookup)
     SF->getScope()
         .buildEnoughOfTreeForTopLevelExpressionsButDontRequestGenericsOrExtendedNominals();