---

yaml
---
r: 313335
b: refs/heads/A-7-9-astscope-no-nesting
c: 46aa705
h: refs/heads/master
i:
  313333: 9fbb180
  313331: e7452ea
  313327: 584eb7c

Author: David Ungar

[refs]

@@ -1416,4 +1416,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-06-30-a: 507bcc31605fe02fdc5d1fadca1bd
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-07-01-a: 503b7173a821a8c714628503dfe1d865d9fb6804
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-07-02-a: 1c3a1b43d7a730aa133f36327138335ce5b27765
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-07-03-a: 67fd73eeb45b2a74028c6799704b79b1de9b7c87
-refs/heads/A-7-9-astscope-no-nesting: e5e7b8363789f662ad23f2d93717c32a6138fef0
+refs/heads/A-7-9-astscope-no-nesting: 46aa705930831cfce24b14beee762242545ce885

branches/A-7-9-astscope-no-nesting/include/swift/AST/ASTScope.h

@@ -896,18 +896,19 @@ class AbstractFunctionDeclScope final : public ASTScopeImpl {
   resolveIsCascadingUseForThisScope(Optional<bool>) const override;
 };
 
-/// The parameters for an abstract function (init/func/deinit).
-class AbstractFunctionParamsScope final : public ASTScopeImpl {
+/// The parameters for an abstract function (init/func/deinit)., subscript, and
+/// enum element
+class ParameterListScope final : public ASTScopeImpl {
 public:
   ParameterList *const params;
   /// For get functions in subscript declarations,
   /// a lookup into the subscript parameters must count as the get func context.
   const NullablePtr<DeclContext> matchingContext;
 
-  AbstractFunctionParamsScope(ParameterList *params,
-                              NullablePtr<DeclContext> matchingContext)
+  ParameterListScope(ParameterList *params,
+                     NullablePtr<DeclContext> matchingContext)
       : params(params), matchingContext(matchingContext) {}
-  virtual ~AbstractFunctionParamsScope() {}
+  virtual ~ParameterListScope() {}
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
@@ -1478,6 +1479,29 @@ class VarDeclScope final : public ASTScopeImpl {
   bool isThisAnAbstractStorageDecl() const override { return true; }
 };
 
+class EnumElementScope : public ASTScopeImpl {
+  EnumElementDecl *const decl;
+
+public:
+  EnumElementScope(EnumElementDecl *e) : decl(e) {}
+
+  SourceRange
+  getChildlessSourceRange(bool omitAssertions = false) const override;
+
+  std::string getClassName() const override;
+  ASTScopeImpl *expandSpecifically(ScopeCreator &) override;
+  NullablePtr<DeclContext> getDeclContext() const override { return decl; }
+  NullablePtr<Decl> getDeclIfAny() const override { return decl; }
+  Decl *getDecl() const { return decl; }
+
+protected:
+  SourceRange
+  getSourceRangeOfEnclosedParams(bool omitAssertions) const override;
+
+private:
+  void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
+};
+
 class AbstractStmtScope : public ASTScopeImpl {
 public:
   SourceRange

branches/A-7-9-astscope-no-nesting/lib/AST/ASTScope.cpp

@@ -187,7 +187,7 @@ NullablePtr<DeclContext> AbstractFunctionDeclScope::getDeclContext() const {
   return decl;
 }
 
-NullablePtr<DeclContext> AbstractFunctionParamsScope::getDeclContext() const {
+NullablePtr<DeclContext> ParameterListScope::getDeclContext() const {
   return matchingContext;
 }
 
@@ -203,7 +203,7 @@ std::string GenericTypeOrExtensionScope::getClassName() const {
 DEFINE_GET_CLASS_NAME(ASTSourceFileScope)
 DEFINE_GET_CLASS_NAME(GenericParamScope)
 DEFINE_GET_CLASS_NAME(AbstractFunctionDeclScope)
-DEFINE_GET_CLASS_NAME(AbstractFunctionParamsScope)
+DEFINE_GET_CLASS_NAME(ParameterListScope)
 DEFINE_GET_CLASS_NAME(MethodBodyScope)
 DEFINE_GET_CLASS_NAME(PureFunctionBodyScope)
 DEFINE_GET_CLASS_NAME(DefaultArgumentInitializerScope)
@@ -220,6 +220,7 @@ DEFINE_GET_CLASS_NAME(TopLevelCodeScope)
 DEFINE_GET_CLASS_NAME(SpecializeAttributeScope)
 DEFINE_GET_CLASS_NAME(SubscriptDeclScope)
 DEFINE_GET_CLASS_NAME(VarDeclScope)
+DEFINE_GET_CLASS_NAME(EnumElementScope)
 DEFINE_GET_CLASS_NAME(IfStmtScope)
 DEFINE_GET_CLASS_NAME(WhileStmtScope)
 DEFINE_GET_CLASS_NAME(GuardStmtScope)

branches/A-7-9-astscope-no-nesting/lib/AST/ASTScopeCreation.cpp

@@ -618,8 +618,7 @@ class ASTVisitorForScopeCreation
   NullablePtr<ASTScopeImpl> visitEnumElementDecl(EnumElementDecl *eed,
                                                  ASTScopeImpl *p,
                                                  ScopeCreator &scopeCreator) {
-    if (auto *expr = eed->getRawValueExpr()) // might contain a closure
-      visitExpr(expr, p, scopeCreator);
+    scopeCreator.createSubtree<EnumElementScope>(p, eed);
     return p;
   }
 
@@ -785,7 +784,7 @@ ASTScopeImpl *ASTScopeImpl::expandAndBeCurrent(ScopeCreator &scopeCreator) {
 #define NO_EXPANSION(Scope)                                                    \
   ASTScopeImpl *Scope::expandSpecifically(ScopeCreator &) { return this; }
 
-CREATES_NEW_INSERTION_POINT(AbstractFunctionParamsScope)
+CREATES_NEW_INSERTION_POINT(ParameterListScope)
 CREATES_NEW_INSERTION_POINT(ConditionalClauseScope)
 CREATES_NEW_INSERTION_POINT(GuardStmtScope)
 CREATES_NEW_INSERTION_POINT(PatternEntryDeclScope)
@@ -797,6 +796,7 @@ CREATES_NEW_INSERTION_POINT(TopLevelCodeScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionBodyScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionDeclScope)
 NO_NEW_INSERTION_POINT(AttachedPropertyWrapperScope)
+NO_NEW_INSERTION_POINT(EnumElementScope)
 
 NO_NEW_INSERTION_POINT(CaptureListScope)
 NO_NEW_INSERTION_POINT(CaseStmtScope)
@@ -824,8 +824,7 @@ NO_EXPANSION(LookupParentDiversionScope)
 #undef CREATES_NEW_INSERTION_POINT
 #undef NO_NEW_INSERTION_POINT
 
-ASTScopeImpl *
-AbstractFunctionParamsScope::expandAScopeThatCreatesANewInsertionPoint(
+ASTScopeImpl *ParameterListScope::expandAScopeThatCreatesANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   // Each initializer for a function parameter is its own, sibling, scope.
   // Unlike generic parameters or pattern initializers, it cannot refer to a
@@ -957,7 +956,7 @@ void AbstractFunctionDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
     leaf = scopeCreator.createGenericParamScopes(decl, decl->getGenericParams(),
                                                  leaf);
     if (isLocalizable(*decl) && getParamsSourceLoc(decl).isValid()) {
-      leaf = scopeCreator.createSubtree<AbstractFunctionParamsScope>(
+      leaf = scopeCreator.createSubtree<ParameterListScope>(
           leaf, decl->getParameters(), nullptr);
     }
   }
@@ -972,6 +971,14 @@ void AbstractFunctionDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   }
 }
 
+void EnumElementScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
+    ScopeCreator &scopeCreator) {
+  if (auto *pl = decl->getParameterList())
+    scopeCreator.createSubtree<ParameterListScope>(this, pl, nullptr);
+  if (auto *expr = decl->getRawValueExpr()) // might contain a closure
+    ASTVisitorForScopeCreation().visitExpr(expr, this, scopeCreator);
+}
+
 void AbstractFunctionBodyScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   expandBody(scopeCreator);
@@ -1071,7 +1078,7 @@ void SubscriptDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   auto *sub = decl;
   auto *leaf =
       scopeCreator.createGenericParamScopes(sub, sub->getGenericParams(), this);
-  auto *params = scopeCreator.createSubtree<AbstractFunctionParamsScope>(
+  auto *params = scopeCreator.createSubtree<ParameterListScope>(
       leaf, sub->getIndices(), sub->getGetter());
   scopeCreator.addChildrenForAllLocalizableAccessors(sub, params);
 }
@@ -1248,7 +1255,7 @@ AbstractFunctionDeclScope::getEnclosingAbstractStorageDecl() const {
   return getParent().get()->getEnclosingAbstractStorageDecl();
 }
 NullablePtr<AbstractStorageDecl>
-AbstractFunctionParamsScope::getEnclosingAbstractStorageDecl() const {
+ParameterListScope::getEnclosingAbstractStorageDecl() const {
   return getParent().get()->getEnclosingAbstractStorageDecl();
 }
 NullablePtr<AbstractStorageDecl>

branches/A-7-9-astscope-no-nesting/lib/AST/ASTScopeSourceRange.cpp

@@ -182,6 +182,11 @@ SubscriptDeclScope::getChildlessSourceRange(const bool omitAssertions) const {
   return decl->getSourceRange();
 }
 
+SourceRange
+EnumElementScope::getChildlessSourceRange(const bool omitAssertions) const {
+  return decl->getSourceRange();
+}
+
 SourceRange
 WholeClosureScope::getChildlessSourceRange(const bool omitAssertions) const {
   return closureExpr->getSourceRange();
@@ -292,14 +297,14 @@ SourceRange AbstractFunctionDeclScope::getChildlessSourceRange(
   return decl->getBody()->getSourceRange();
 }
 
-SourceRange AbstractFunctionParamsScope::getChildlessSourceRange(
-    const bool omitAssertions) const {
+SourceRange
+ParameterListScope::getChildlessSourceRange(const bool omitAssertions) const {
   const auto rangeForGoodInput = getSourceRangeOfEnclosedParams(omitAssertions);
   return SourceRange(rangeForGoodInput.Start,
                      fixupEndForBadInput(rangeForGoodInput));
 }
 
-SourceLoc AbstractFunctionParamsScope::fixupEndForBadInput(
+SourceLoc ParameterListScope::fixupEndForBadInput(
     const SourceRange rangeForGoodInput) const {
   const auto s = rangeForGoodInput.Start;
   const auto e = rangeForGoodInput.End;
@@ -541,6 +546,12 @@ ASTScopeImpl::getSourceRangeOfEnclosedParams(const bool omitAssertions) const {
   return getParent().get()->getSourceRangeOfEnclosedParams(omitAssertions);
 }
 
+SourceRange
+EnumElementScope::getSourceRangeOfEnclosedParams(bool omitAssertions) const {
+  auto *pl = decl->getParameterList();
+  return pl ? pl->getSourceRange() : SourceRange();
+}
+
 SourceRange SubscriptDeclScope::getSourceRangeOfEnclosedParams(
     const bool omitAssertions) const {
   auto r = SourceRange(decl->getIndices()->getLParenLoc(), decl->getEndLoc());