---

yaml
---
r: 340599
b: refs/heads/rxwei-patch-1
c: 2b7b7cf
h: refs/heads/master
i:
  340597: 2d84adc
  340595: b449d21
  340591: 6c16df8

Author: David Ungar

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: f2035092504a0e1ad23473c3ba0b4005e34b4ead
+refs/heads/rxwei-patch-1: 2b7b7cfec1963f09e818c40771d24d9a9001ff39
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/ASTScope.h

@@ -1170,7 +1170,7 @@ class TopLevelCodeScope final : public ASTScopeImpl {
   ASTScopeImpl *expandMe(ScopeCreator &scopeCreator) override;
 
 private:
-  void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
+  ASTScopeImpl *expandAScopeThatCreatesANewInsertionPoint(ScopeCreator &);
 
 public:
   std::string getClassName() const override;

branches/rxwei-patch-1/lib/AST/ASTScopeCreation.cpp

@@ -586,6 +586,8 @@ CREATES_NEW_INSERTION_POINT(PatternEntryInitializerScope)
 CREATES_NEW_INSERTION_POINT(PatternEntryUseScope)
 CREATES_NEW_INSERTION_POINT(GenericTypeOrExtensionScope)
 CREATES_NEW_INSERTION_POINT(BraceStmtScope)
+CREATES_NEW_INSERTION_POINT(TopLevelCodeScope)
+
 
 NO_NEW_INSERTION_POINT(AbstractFunctionBodyScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionDeclScope)
@@ -601,7 +603,6 @@ NO_NEW_INSERTION_POINT(IfStmtScope)
 NO_NEW_INSERTION_POINT(RepeatWhileScope)
 NO_NEW_INSERTION_POINT(SubscriptDeclScope)
 NO_NEW_INSERTION_POINT(SwitchStmtScope)
-NO_NEW_INSERTION_POINT(TopLevelCodeScope)
 NO_NEW_INSERTION_POINT(VarDeclScope)
 NO_NEW_INSERTION_POINT(WhileStmtScope)
 NO_NEW_INSERTION_POINT(WholeClosureScope)
@@ -715,6 +716,12 @@ ASTScopeImpl *BraceStmtScope::expandAScopeThatCreatesANewInsertionPoint(
   return scopeCreator.addScopesToTree(this, stmt->getElements());
 }
 
+ASTScopeImpl *TopLevelCodeScope::expandAScopeThatCreatesANewInsertionPoint(
+    ScopeCreator &scopeCreator) {
+  return scopeCreator.createSubtree<BraceStmtScope>(this, decl->getBody());
+}
+
+
 #pragma mark expandAScopeThatDoesNotCreateANewInsertionPoint
 
 void ASTSourceFileScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
@@ -886,11 +893,6 @@ void ClosureBodyScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   scopeCreator.createSubtree<BraceStmtScope>(this, closureExpr->getBody());
 }
 
-void TopLevelCodeScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
-    ScopeCreator &scopeCreator) {
-  scopeCreator.createSubtree<BraceStmtScope>(this, decl->getBody());
-}
-
 void DefaultArgumentInitializerScope::
     expandAScopeThatDoesNotCreateANewInsertionPoint(
         ScopeCreator &scopeCreator) {