deps: V8: cherry-pick 4c074516397b

targos · targos · commit 3c6c28b0a1e3 · 2021-06-14T08:12:28.000+02:00
Original commit message: [promises] Fix slow path when context promise hooks are present Bug: chromium:1201936 Change-Id: I1ee545e33587ddf4a5c7e1cbd64b53d36c75a146 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2850936 Reviewed-by: Marja Hölttä <marja@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Commit-Queue: Camillo Bruni <cbruni@chromium.org> Cr-Commit-Position: refs/heads/master@{#74267} Refs: v8/v8@4c07451 PR-URL: #38273 Backport-PR-URL: #38991 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Mary Marchini <oss@mmarchini.me>
diff --git 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.11',
+    'v8_embedder_string': '-node.12',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/src/builtins/promise-jobs.tq b/deps/v8/src/builtins/promise-jobs.tq
@@ -7,6 +7,7 @@
 // https://tc39.es/ecma262/#sec-promise-jobs
 namespace promise {
 extern macro IsJSPromiseMap(Map): bool;
+extern macro NeedsAnyPromiseHooks(): bool;
 
 // https://tc39.es/ecma262/#sec-promiseresolvethenablejob
 transitioning builtin
@@ -25,7 +26,7 @@ PromiseResolveThenableJob(implicit context: Context)(
   const promiseThen = *NativeContextSlot(ContextSlot::PROMISE_THEN_INDEX);
   const thenableMap = thenable.map;
   if (TaggedEqual(then, promiseThen) && IsJSPromiseMap(thenableMap) &&
-      !IsIsolatePromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate() &&
+      !NeedsAnyPromiseHooks() &&
       IsPromiseSpeciesLookupChainIntact(nativeContext, thenableMap)) {
     // We know that the {thenable} is a JSPromise, which doesn't require
     // any special treatment and that {then} corresponds to the initial
diff --git a/deps/v8/src/codegen/code-stub-assembler.cc b/deps/v8/src/codegen/code-stub-assembler.cc
@@ -13843,11 +13843,11 @@ TNode<BoolT> CodeStubAssembler::
   return Word32NotEqual(flags, Int32Constant(0));
 }
 
-TNode<BoolT> CodeStubAssembler::
-    IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(TNode<Uint32T> flags) {
+TNode<BoolT> CodeStubAssembler::NeedsAnyPromiseHooks(TNode<Uint32T> flags) {
   uint32_t mask = Isolate::PromiseHookFields::HasContextPromiseHook::kMask |
                   Isolate::PromiseHookFields::HasIsolatePromiseHook::kMask |
-                  Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask;
+                  Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask |
+                  Isolate::PromiseHookFields::IsDebugActive::kMask;
   return IsSetWord32(flags, mask);
 }
 
diff --git a/deps/v8/src/codegen/code-stub-assembler.h b/deps/v8/src/codegen/code-stub-assembler.h
@@ -3535,12 +3535,10 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
     return IsAnyPromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate(
         PromiseHookFlags());
   }
-  TNode<BoolT> IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
-      TNode<Uint32T> flags);
-  TNode<BoolT>
-  IsAnyPromiseHookEnabledOrHasAsyncEventDelegate() {
-    return IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
-        PromiseHookFlags());
+
+  TNode<BoolT> NeedsAnyPromiseHooks(TNode<Uint32T> flags);
+  TNode<BoolT> NeedsAnyPromiseHooks() {
+    return NeedsAnyPromiseHooks(PromiseHookFlags());
   }
 
   // for..in helpers

Original file line number	Diff line number	Diff line change
`@@ -13843,11 +13843,11 @@ TNode<BoolT> CodeStubAssembler::`
`13843`	`13843`	`return Word32NotEqual(flags, Int32Constant(0));`
`13844`	`13844`	`}`
`13845`	`13845`
`13846`		`-TNode<BoolT> CodeStubAssembler::`
`13847`		`- IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(TNode<Uint32T> flags) {`
	`13846`	`+TNode<BoolT> CodeStubAssembler::NeedsAnyPromiseHooks(TNode<Uint32T> flags) {`
`13848`	`13847`	`uint32_t mask = Isolate::PromiseHookFields::HasContextPromiseHook::kMask \|`
`13849`	`13848`	`Isolate::PromiseHookFields::HasIsolatePromiseHook::kMask \|`
`13850`		`- Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask;`
	`13849`	`+ Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask \|`
	`13850`	`+ Isolate::PromiseHookFields::IsDebugActive::kMask;`
`13851`	`13851`	`return IsSetWord32(flags, mask);`
`13852`	`13852`	`}`
`13853`	`13853`