From cbf28f95b820be9fac0881b9696c52a224e3f698 Mon Sep 17 00:00:00 2001 From: Lu Yahan Date: Mon, 7 Mar 2022 10:58:21 +0800 Subject: [PATCH] deps: V8: cherry-pick c6f6626deb14 Original commit message: [riscv64] Fix segmentation fault of webpack-make from cockpit issue: https://github.com/riscv-collab/v8/issues/520 Change-Id: I7fe298ad16a2f599805929db0f084a81c4eb7f7a Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3503170 Auto-Submit: Yahan Lu Reviewed-by: ji qiu Reviewed-by: Yahan Lu Commit-Queue: Yahan Lu Cr-Commit-Position: refs/heads/main@{#79376} Refs: https://github.com/v8/v8/commit/c6f6626deb147fccc8bb5c32f96481efd9aaad0a --- common.gypi | 2 +- deps/v8/src/regexp/riscv64/regexp-macro-assembler-riscv64.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index 702eea8395f4db..fed781736bfa4c 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.15', + 'v8_embedder_string': '-node.16', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/regexp/riscv64/regexp-macro-assembler-riscv64.cc b/deps/v8/src/regexp/riscv64/regexp-macro-assembler-riscv64.cc index dda2104feb3d1d..74fb625e612c4e 100644 --- a/deps/v8/src/regexp/riscv64/regexp-macro-assembler-riscv64.cc +++ b/deps/v8/src/regexp/riscv64/regexp-macro-assembler-riscv64.cc @@ -899,8 +899,8 @@ Handle RegExpMacroAssemblerRISCV::GetCode(Handle source) { __ Branch(&load_char_start_regexp, ne, current_input_offset(), Operand(s3)); // Offset from the end is zero if we already reached the end. - __ BranchShort(&exit_label_, eq, current_input_offset(), - Operand(zero_reg)); + __ Branch(&exit_label_, eq, current_input_offset(), + Operand(zero_reg)); // Advance current position after a zero-length match. Label advance; __ bind(&advance);