deps,v8: cherry-pick 385aa80

Original commit message: Correct removal of redundant moves The logic for removing while iterating is non-standard and a left over from a previous index based loop. This patch replaces it with a standard erase based version. This fixes a runtime crash with MSVC that invalidates the iterator and then asserts. This also makes the code safe in case the last move can be redundant. Change-Id: Ie6990e0d65a3b83a4b7da3e2e89ed4e60a6cd215 Reviewed-on: https://chromium-review.googlesource.com/c/1488762 Reviewed-by: Ben Titzer <titzer@chromium.org> Commit-Queue: Ben Titzer <titzer@chromium.org> Cr-Commit-Position: refs/heads/master@{#59868} Refs: v8/v8@385aa80 PR-URL: #26702 Fixes: #26694 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michaël Zasso <targos@protonmail.com>
nodejs · Mar 17, 2019 · 8e308e8b2804344768037b5764328cf5cfdfaade · 8e308e8
1 parent f105654
commit 8e308e8b2804344768037b5764328cf5cfdfaade
Showing with 3 additions and 3 deletions.

+1 −1 common.gypi

+1 −0 deps/v8/AUTHORS

+1 −2 deps/v8/src/compiler/backend/gap-resolver.cc
diff --git a/common.gypi b/common.gypi
@@ -37,7 +37,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.6',
+    'v8_embedder_string': '-node.7',
 
     ##### V8 defaults for Node.js #####
 

diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS
@@ -46,6 +46,7 @@ Alexander Botero-Lowry <alexbl@FreeBSD.org>
 Alexander Karpinsky <homm86@gmail.com>
 Alexandre Vassalotti <avassalotti@gmail.com>
 Alexis Campailla <alexis@janeasystems.com>
+Allan Sandfeld Jensen <allan.jensen@qt.io>
 Amos Lim <eui-sang.lim@samsung.com>
 Andreas Anyuru <andreas.anyuru@gmail.com>
 Andrew Paprocki <andrew@ishiboo.com>

diff --git a/deps/v8/src/compiler/backend/gap-resolver.cc b/deps/v8/src/compiler/backend/gap-resolver.cc
@@ -96,8 +96,7 @@ void GapResolver::Resolve(ParallelMove* moves) {
   for (auto it = moves->begin(); it != moves->end();) {
     MoveOperands* move = *it;
     if (move->IsRedundant()) {
-      *it = moves->back();
-      moves->pop_back();
+      it = moves->erase(it);
       continue;
     }
     source_kinds.Add(GetKind(move->source()));