Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

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.