From 39e44f8382ecfcfe445eddd0a0c3269f08d716fc Mon Sep 17 00:00:00 2001
From: Gus Caplan <me@gus.host>
Date: Wed, 2 Feb 2022 09:54:37 -0600
Subject: [PATCH] deps: V8: cherry-pick cc9a8a37445e

Original commit message:

    fix overflow check in error formatting

    Bug: v8:12494
    Change-Id: Iba2684173296aa236f1a1c73a5606c21472eff06
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3426634
    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
    Commit-Queue: Gus Caplan <snek@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#78909}

Refs: https://github.com/v8/v8/commit/cc9a8a37445eeffff17474020bb6038c2f9af9fc

PR-URL: https://github.com/nodejs/node/pull/41826
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
---
 common.gypi                       | 2 +-
 deps/v8/src/execution/messages.cc | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common.gypi b/common.gypi
index 0f01e7eca1273f..98528bdc9d04e8 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.86',
+    'v8_embedder_string': '-node.87',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/src/execution/messages.cc b/deps/v8/src/execution/messages.cc
index 4f9ee68baede5b..1b444125805e43 100644
--- a/deps/v8/src/execution/messages.cc
+++ b/deps/v8/src/execution/messages.cc
@@ -858,7 +858,8 @@ MaybeHandle<Object> ErrorUtils::FormatStackTrace(Isolate* isolate,
   Handle<FixedArray> elems = Handle<FixedArray>::cast(raw_stack);
 
   const bool in_recursion = isolate->formatting_stack_trace();
-  if (!in_recursion) {
+  const bool has_overflowed = i::StackLimitCheck{isolate}.HasOverflowed();
+  if (!in_recursion && !has_overflowed) {
     Handle<Context> error_context = error->GetCreationContext();
     DCHECK(error_context->IsNativeContext());