From 1771a07be668a13f5fd340423467d6b7b4b1af66 Mon Sep 17 00:00:00 2001 From: Pedro Pontes Date: Tue, 19 Apr 2022 14:18:34 +0200 Subject: [PATCH 1/2] chore: cherry-pick e42dbcdedb7a from v8 --- patches/v8/.patches | 1 + patches/v8/cherry-pick-e42dbcdedb7a.patch | 38 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 patches/v8/cherry-pick-e42dbcdedb7a.patch diff --git a/patches/v8/.patches b/patches/v8/.patches index 86a626b207a4e..e168379c0c1cd 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -24,3 +24,4 @@ cherry-pick-c46fb3a15ec2.patch cherry-pick-a1427aad7cef.patch cherry-pick-f599381978f2.patch cherry-pick-f546ac11eec7.patch +cherry-pick-e42dbcdedb7a.patch diff --git a/patches/v8/cherry-pick-e42dbcdedb7a.patch b/patches/v8/cherry-pick-e42dbcdedb7a.patch new file mode 100644 index 0000000000000..923fd983ad049 --- /dev/null +++ b/patches/v8/cherry-pick-e42dbcdedb7a.patch @@ -0,0 +1,38 @@ +From e42dbcdedb7a7fad504bb1979500cda05baddc1f Mon Sep 17 00:00:00 2001 +From: Brendon Tiszka +Date: Fri, 18 Mar 2022 01:32:54 -0400 +Subject: [PATCH] Merged: Update write barrier when storing HeapNumber to last index. + +(cherry picked from commit bdc4f54a50293507d9ef51573bab537883560cc8) + +No-Try: true +No-Presubmit: true +No-Treechecks: true +Bug: chromium:1307610 +Change-Id: I60aaa0e58e13b705b5eff4b57411a0ad4a2e9b3f +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3534849 +Reviewed-by: Jakob Gruber +Commit-Queue: Jakob Gruber +Cr-Original-Commit-Position: refs/heads/main@{#79538} +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3565716 +Reviewed-by: Patrick Thier +Commit-Queue: Jakob Linke +Cr-Commit-Position: refs/branch-heads/10.0@{#18} +Cr-Branched-From: 6ea73a738c467dc26abbbe84e27a36aac1c6e119-refs/heads/10.0.139@{#1} +Cr-Branched-From: ccc689011280419901e6ee42cae39980c0e96030-refs/heads/main@{#79131} +--- + +diff --git a/src/regexp/regexp-utils.cc b/src/regexp/regexp-utils.cc +index dabe5ee..b260071 100644 +--- a/src/regexp/regexp-utils.cc ++++ b/src/regexp/regexp-utils.cc +@@ -49,7 +49,8 @@ + Handle value_as_object = + isolate->factory()->NewNumberFromInt64(value); + if (HasInitialRegExpMap(isolate, *recv)) { +- JSRegExp::cast(*recv).set_last_index(*value_as_object, SKIP_WRITE_BARRIER); ++ JSRegExp::cast(*recv).set_last_index(*value_as_object, ++ UPDATE_WRITE_BARRIER); + return recv; + } else { + return Object::SetProperty( From 2ec2a1a257385b3ad84b85283ed222efb7628d33 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 12:29:58 +0000 Subject: [PATCH 2/2] chore: update patches --- patches/v8/cherry-pick-e42dbcdedb7a.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/patches/v8/cherry-pick-e42dbcdedb7a.patch b/patches/v8/cherry-pick-e42dbcdedb7a.patch index 923fd983ad049..0a7d55ed9c554 100644 --- a/patches/v8/cherry-pick-e42dbcdedb7a.patch +++ b/patches/v8/cherry-pick-e42dbcdedb7a.patch @@ -1,7 +1,7 @@ -From e42dbcdedb7a7fad504bb1979500cda05baddc1f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brendon Tiszka Date: Fri, 18 Mar 2022 01:32:54 -0400 -Subject: [PATCH] Merged: Update write barrier when storing HeapNumber to last index. +Subject: Merged: Update write barrier when storing HeapNumber to last index. (cherry picked from commit bdc4f54a50293507d9ef51573bab537883560cc8) @@ -20,13 +20,12 @@ Commit-Queue: Jakob Linke Cr-Commit-Position: refs/branch-heads/10.0@{#18} Cr-Branched-From: 6ea73a738c467dc26abbbe84e27a36aac1c6e119-refs/heads/10.0.139@{#1} Cr-Branched-From: ccc689011280419901e6ee42cae39980c0e96030-refs/heads/main@{#79131} ---- diff --git a/src/regexp/regexp-utils.cc b/src/regexp/regexp-utils.cc -index dabe5ee..b260071 100644 +index 1e72a124c95729ebf9c4a7caed52b5551408a525..9ddf82e95a7c07bbb7a529167bbf30058a1cbd14 100644 --- a/src/regexp/regexp-utils.cc +++ b/src/regexp/regexp-utils.cc -@@ -49,7 +49,8 @@ +@@ -49,7 +49,8 @@ MaybeHandle RegExpUtils::SetLastIndex(Isolate* isolate, Handle value_as_object = isolate->factory()->NewNumberFromInt64(value); if (HasInitialRegExpMap(isolate, *recv)) {