From aaeeb75a9992cc29640bf93f1b7fe233156c86c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sat, 17 Apr 2021 16:28:41 +0200
Subject: [PATCH] deps: V8: cherry-pick 33f4064dbad3

Original commit message:

    Merged: Squashed multiple commits.

    Merged: Prepare renaming "V8 Linux64 TSAN - concurrent marking" bot
    Revision: 165d8f5b5ab5ba6fa19acd7ae6b17aa1a1b18428

    Merged: [test] Remove entry of renamed builder
    Revision: 375579f940b96224b2c525a6133650b760a5d865

    NOTRY=true
    NOPRESUBMIT=true
    NOTREECHECKS=true
    TBR=neis@chromium.org

    Change-Id: If7c8296c495d087c2e4dc6cde3512bc3f8a469fc
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2418098
    Reviewed-by: Michael Achenbach <machenbach@chromium.org>
    Reviewed-by: Georg Neis <neis@chromium.org>
    Commit-Queue: Michael Achenbach <machenbach@chromium.org>
    Cr-Commit-Position: refs/branch-heads/8.6@{#14}
    Cr-Branched-From: a64aed2333abf49e494d2a5ce24bbd14fff19f60-refs/heads/8.6.395@{#1}
    Cr-Branched-From: a626bc036236c9bf92ac7b87dc40c9e538b087e3-refs/heads/master@{#69472}

Refs: https://github.com/v8/v8/commit/33f4064dbad34d4d34df2b4a879163511d0eaa4d

PR-URL: https://github.com/nodejs/node/pull/38275
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
---
 common.gypi                        | 2 +-
 deps/v8/infra/testing/builders.pyl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.gypi b/common.gypi
index 6281ebc6fca5e6..6529871fbffe1f 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,7 +36,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.32',
+    'v8_embedder_string': '-node.33',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/infra/testing/builders.pyl b/deps/v8/infra/testing/builders.pyl
index 72f739487ccec3..113413bbe8c331 100644
--- a/deps/v8/infra/testing/builders.pyl
+++ b/deps/v8/infra/testing/builders.pyl
@@ -1078,7 +1078,7 @@
       {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
     ],
   },
-  'V8 Linux64 TSAN - concurrent marking': {
+  'V8 Linux64 TSAN - stress-incremental-marking': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -1105,7 +1105,7 @@
       {
         'name': 'v8testing',
         'test_args': ['--extra-flags=--stress-incremental-marking'],
-        'shards': 4,
+        'shards': 6,
       },
     ],
   },