fix top level vars

Author: hamishknight

include/swift/AST/ASTScope.h

@@ -140,6 +140,7 @@ class ASTScopeImpl : public ASTAllocated<ASTScopeImpl> {
   friend class GenericTypeOrExtensionWherePortion;
   friend class GenericTypeOrExtensionWherePortion;
   friend class IterableTypeBodyPortion;
+  friend class TopLevelCodeScope;
   friend class ScopeCreator;
   friend class ASTSourceFileScope;
   friend class ABIAttributeScope;
@@ -245,7 +246,7 @@ class ASTScopeImpl : public ASTAllocated<ASTScopeImpl> {
 #pragma mark - debugging and printing
 
 public:
-  const SourceFile *getSourceFile() const;
+  SourceFile *getSourceFile() const;
   std::string getClassName() const;
 
   /// Print out this scope for debugging/reporting purposes.
@@ -1212,18 +1213,19 @@ class ClosureParametersScope final : public ASTScopeImpl {
 class TopLevelCodeScope final : public ASTScopeImpl {
 public:
   TopLevelCodeDecl *const decl;
-  SourceLoc endLoc;
+  ASTScopeImpl *insertionPoint = nullptr;
 
-  TopLevelCodeScope(TopLevelCodeDecl *e, SourceLoc endLoc)
-      : ASTScopeImpl(ScopeKind::TopLevelCode), decl(e), endLoc(endLoc) {}
+  TopLevelCodeScope(TopLevelCodeDecl *e)
+      : ASTScopeImpl(ScopeKind::TopLevelCode), decl(e) {}
   virtual ~TopLevelCodeScope() {}
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
 
+  NullablePtr<const ASTScopeImpl> getLookupParent() const override;
+
 private:
-  AnnotatedInsertionPoint
-  expandAScopeThatCreatesANewInsertionPoint(ScopeCreator &);
+  void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
 
 public:
   SourceRange

include/swift/AST/Decl.h

@@ -503,7 +503,7 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl>, public Swi
     IsStatic : 1
   );
 
-  SWIFT_INLINE_BITFIELD(VarDecl, AbstractStorageDecl, 2+1+1+1+1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(VarDecl, AbstractStorageDecl, 2+1+1+1+1+1+1+1,
     /// Encodes whether this is a 'let' binding.
     Introducer : 2,
 
@@ -520,9 +520,6 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl>, public Swi
     /// Whether this is the backing storage for a property wrapper.
     IsPropertyWrapperBackingProperty : 1,
 
-    /// Whether this is a lazily top-level global variable from the main file.
-    IsTopLevelGlobal : 1,
-
     /// Whether this variable has no attached property wrappers.
     NoAttachedPropertyWrappers : 1,
 
@@ -2879,6 +2876,8 @@ class PatternBindingDecl final : public Decl,
 /// global variables.
 class TopLevelCodeDecl : public DeclContext, public Decl {
   BraceStmt *Body;
+  std::optional<TopLevelCodeDecl *> Previous;
+
   SourceLoc getLocFromSource() const { return getStartLoc(); }
   friend class Decl;
 public:
@@ -2890,6 +2889,8 @@ class TopLevelCodeDecl : public DeclContext, public Decl {
   BraceStmt *getBody() const { return Body; }
   void setBody(BraceStmt *b) { Body = b; }
 
+  TopLevelCodeDecl *getPrevious() const;
+
   SourceLoc getStartLoc() const;
   SourceRange getSourceRange() const;
 
@@ -6816,10 +6817,6 @@ class VarDecl : public AbstractStorageDecl {
   /// Retrieve the backing storage property for a lazy property.
   VarDecl *getLazyStorageProperty() const;
 
-  /// True if this is a top-level global variable from the main source file.
-  bool isTopLevelGlobal() const { return Bits.VarDecl.IsTopLevelGlobal; }
-  void setTopLevelGlobal(bool b) { Bits.VarDecl.IsTopLevelGlobal = b; }
-
   /// True if this is any storage of static duration (global scope or static).
   bool isGlobalStorage() const;
 

include/swift/AST/DiagnosticsSema.def

@@ -6181,8 +6181,6 @@ ERROR(global_actor_arg,none,
       (Type))
 ERROR(global_actor_non_final_class,none,
       "non-final class %0 cannot be a global actor", (DeclName))
-ERROR(global_actor_top_level_var,none,
-      "top-level code variables cannot have a global actor", ())
 ERROR(global_actor_access,none,
       "%select{private|fileprivate|internal|package|public|open}0 %kind1 "
       "cannot have %select{private|fileprivate|internal|package|%error|%error}2 "
@@ -7194,14 +7192,6 @@ ERROR(availability_decl_no_unavailable, none,
       "%kindonly0 cannot be marked unavailable with '@available'",
       (const Decl *))
 
-ERROR(availability_global_script_no_potential,
-      none, "global variable cannot be marked potentially "
-      "unavailable with '@available' in script mode", ())
-
-ERROR(availability_global_script_no_unavailable,
-      none, "global variable cannot be marked unavailable "
-      "with '@available' in script mode", ())
-
 ERROR(availability_stored_property_no_potential,
       none, "stored properties cannot be marked potentially unavailable with "
       "'@available'", ())

include/swift/Parse/Parser.h

@@ -1299,8 +1299,7 @@ class Parser {
                                            StaticSpellingKind StaticSpelling,
                                            SourceLoc VarLoc,
                                            bool hasInitializer,
-                                           const DeclAttributes &Attributes,
-                                           SmallVectorImpl<Decl *> &Decls);
+                                           const DeclAttributes &Attributes);
   ParserStatus parseGetEffectSpecifier(ParsedAccessors &accessors,
                                        SourceLoc &asyncLoc,
                                        SourceLoc &throwsLoc,

lib/AST/ASTDumper.cpp

@@ -2620,7 +2620,6 @@ namespace {
       printFlag(VD->isDebuggerVar(), "debugger_var", DeclModifierColor);
       printFlag(VD->isLazyStorageProperty(), "lazy_storage_property",
                 DeclModifierColor);
-      printFlag(VD->isTopLevelGlobal(), "top_level_global", DeclModifierColor);
       printFlag(VD->isLazyStorageProperty(), "lazy_storage_property",
                 DeclModifierColor);
 

lib/AST/ASTScope.cpp

@@ -334,7 +334,7 @@ ASTContext &ASTScopeImpl::getASTContext() const {
 
 #pragma mark getSourceFile
 
-const SourceFile *ASTScopeImpl::getSourceFile() const {
+SourceFile *ASTScopeImpl::getSourceFile() const {
   if (auto sourceFileScope = dyn_cast<ASTSourceFileScope>(this))
     return sourceFileScope->SF;
 

lib/AST/ASTScopeCreation.cpp

@@ -483,9 +483,7 @@ class NodeAdder
   ASTScopeImpl *visitTopLevelCodeDecl(TopLevelCodeDecl *d,
                                       ASTScopeImpl *p,
                                       ScopeCreator &scopeCreator) {
-    ASTScopeAssert(endLoc.has_value(), "TopLevelCodeDecl in wrong place?");
-    return scopeCreator.constructExpandAndInsert<TopLevelCodeScope>(
-        p, d, *endLoc);
+    return scopeCreator.constructExpandAndInsert<TopLevelCodeScope>(p, d);
   }
 
 #pragma mark special-case creation
@@ -800,10 +798,10 @@ CREATES_NEW_INSERTION_POINT(GuardStmtScope)
 CREATES_NEW_INSERTION_POINT(PatternEntryDeclScope)
 CREATES_NEW_INSERTION_POINT(GenericTypeOrExtensionScope)
 CREATES_NEW_INSERTION_POINT(BraceStmtScope)
-CREATES_NEW_INSERTION_POINT(TopLevelCodeScope)
 CREATES_NEW_INSERTION_POINT(ConditionalClausePatternUseScope)
 CREATES_NEW_INSERTION_POINT(ABIAttributeScope)
 
+NO_NEW_INSERTION_POINT(TopLevelCodeScope)
 NO_NEW_INSERTION_POINT(FunctionBodyScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionDeclScope)
 NO_NEW_INSERTION_POINT(CustomAttributeScope)
@@ -1017,19 +1015,6 @@ BraceStmtScope::expandAScopeThatCreatesANewInsertionPoint(
       "For top-level code decls, need the scope under, say a guard statement."};
 }
 
-AnnotatedInsertionPoint
-TopLevelCodeScope::expandAScopeThatCreatesANewInsertionPoint(ScopeCreator &
-                                                             scopeCreator) {
-
-  auto *body =
-      scopeCreator
-          .addToScopeTreeAndReturnInsertionPoint(decl->getBody(), this, endLoc);
-
-  return {body, "So next top level code scope and put its decls in its body "
-                "under a guard statement scope (etc) from the last top level "
-                "code scope"};
-}
-
 AnnotatedInsertionPoint
 ABIAttributeScope::expandAScopeThatCreatesANewInsertionPoint(
     ScopeCreator &scopeCreator) {
@@ -1294,6 +1279,12 @@ void CustomAttributeScope::
   }
 }
 
+void TopLevelCodeScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
+    ScopeCreator &scopeCreator) {
+  insertionPoint = scopeCreator.addToScopeTreeAndReturnInsertionPoint(decl->getBody(), this,
+                                                     std::nullopt);
+}
+
 #pragma mark expandScope
 
 ASTScopeImpl *GenericTypeOrExtensionWholePortion::expandScope(

lib/AST/ASTScopeLookup.cpp

@@ -353,6 +353,20 @@ ConditionalClauseInitializerScope::getLookupParent() const {
   return parent->getLookupParent();
 }
 
+NullablePtr<const ASTScopeImpl> TopLevelCodeScope::getLookupParent() const {
+  auto parent = getParent().get();
+  if (auto *prev = decl->getPrevious()) {
+    auto *fileScope = cast<ASTSourceFileScope>(parent);
+    auto prevScope = fileScope->findChildContaining(prev->getEndLoc(), getSourceManager());
+    if (auto *prevTopLevel = dyn_cast<TopLevelCodeScope>(prevScope.getPtrOrNull())) {
+      if (!prevTopLevel->getWasExpanded())
+        prevTopLevel->expandAndBeCurrent(const_cast<TopLevelCodeScope *>(this)->getScopeCreator());
+      return prevTopLevel->insertionPoint;
+    }
+  }
+  return parent;
+}
+
 #pragma mark looking in locals or members - locals
 
 bool GenericParamScope::lookupLocalsOrMembers(DeclConsumer consumer) const {

lib/AST/ASTScopeSourceRange.cpp

@@ -127,7 +127,7 @@ SourceRange FunctionBodyScope::getSourceRangeOfThisASTNode(
 
 SourceRange TopLevelCodeScope::getSourceRangeOfThisASTNode(
     const bool omitAssertions) const {
-  return SourceRange(decl->getStartLoc(), endLoc);
+  return decl->getSourceRange();
 }
 
 SourceRange SubscriptDeclScope::getSourceRangeOfThisASTNode(

lib/AST/ASTVerifier.cpp

@@ -2642,10 +2642,14 @@ class Verifier : public ASTWalker {
     }
 
     void verifyChecked(PatternBindingDecl *binding) {
+      auto isTopLevel = isa<TopLevelCodeDecl>(binding->getDeclContext());
       // Look at all of the VarDecls being bound.
       for (auto idx : range(binding->getNumPatternEntries()))
         if (auto *P = binding->getPattern(idx))
           P->forEachVariable([&](VarDecl *VD) {
+            auto varIsTopLevel = isa<TopLevelCodeDecl>(VD->getDeclContext());
+            ASSERT(isTopLevel == varIsTopLevel &&
+                   "Must have consistent top-level context");
             // ParamDecls never get PBD's.
             assert(!isa<ParamDecl>(VD) && "ParamDecl has a PatternBindingDecl?");
           });