Insert in order and other fix

Author: David Ungar

lib/Parse/ParseDecl.cpp

@@ -3220,6 +3220,26 @@ void Parser::parseDeclListDelayed(IterableDeclContext *IDC) {
   }
 }
 
+/// Return copy of \p existingNodes with \p newNode inserted in source order
+static SmallVector<ASTNode, 8> insertInOrder(ArrayRef<ASTNode> existingNodes,
+                                             const ASTNode newNode,
+                                             SourceManager &SM) {
+  SmallVector<ASTNode, 8> nodesWithInsertion;
+  bool didInsert = false;
+  auto newNodeStart = newNode.getStartLoc();
+  for (auto n : existingNodes) {
+    if (SM.isBeforeInBuffer(newNodeStart, n.getStartLoc())) {
+      nodesWithInsertion.push_back(newNode);
+      didInsert = true;
+    }
+    nodesWithInsertion.push_back(n);
+  }
+  if (!didInsert)
+    nodesWithInsertion.push_back(newNode);
+
+  return nodesWithInsertion;
+}
+
 void Parser::parseDeclDelayed() {
   auto DelayedState = State->takeDelayedDeclState();
   assert(DelayedState.get() && "should have delayed state");
@@ -3258,11 +3278,10 @@ void Parser::parseDeclDelayed() {
       } else if (auto *SF = dyn_cast<SourceFile>(parent)) {
         SF->Decls.push_back(D);
       } else if (auto *CE = dyn_cast<ClosureExpr>(parent)) {
-        // Replace the closure body with one including the new Decl.
-        auto *body = CE->getBody();
-        SmallVector<ASTNode, 8> Elts(body->getElements().begin(),
-                                     body->getElements().end());
-        Elts.push_back(ASTNode(D));
+        // Replace the closure body with one including the new Decl, inserted in
+        // order.
+        auto *const body = CE->getBody();
+        auto Elts = insertInOrder(body->getElements(), D, SourceMgr);
         auto *newBody =
             BraceStmt::create(Context, body->getLBraceLoc(), Elts,
                               body->getRBraceLoc(), body->isImplicit());
@@ -4878,9 +4897,7 @@ Parser::parseDeclVarGetSet(Pattern *pattern, ParseDeclOptions Flags,
   // If we have an invalid case, bail out now.
   if (!PrimaryVar) {
     fillInAccessorTypeErrors(*this, accessors);
-    Decls.append(accessors.Accessors.begin(), accessors.Accessors.end());
-    // Preserve the invariaent that accessor an can be found from its
-    // VarDecl.
+    // Preserve the invariant that an accessor can be found from its VarDecl
     accessors.record(*this, storage, Invalid, Decls);
     return nullptr;
   }