---

yaml
---
r: 349508
b: refs/heads/master-next
c: a4fc5f3
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 075acb0415aca5e232d1f5df2037d992fadd764f
+refs/heads/master-next: a4fc5f34f93cd80ad5ecb718d7c6b9f3e4ea2726
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/AST/ASTScopeCreation.cpp

@@ -168,7 +168,9 @@ class ScopeCreator final {
 
   ScopeCreator(SourceFile *SF)
       : ctx(SF->getASTContext()),
-        sourceFileScope(new (ctx) ASTSourceFileScope(SF, this)) {}
+        sourceFileScope(new (ctx) ASTSourceFileScope(SF, this)) {
+    ctx.addDestructorCleanup(scopedNodes);
+  }
 
   ScopeCreator(const ScopeCreator &) = delete;  // ensure no copies
   ScopeCreator(const ScopeCreator &&) = delete; // ensure no moves
@@ -660,8 +662,6 @@ class ScopeCreator final {
 
   // Make vanilla new illegal for ASTScopes.
   void *operator new(size_t bytes) = delete;
-  // Need this because have virtual destructors
-  void operator delete(void *data) {}
 
   // Only allow allocation of scopes using the allocator of a particular source
   // file.