Skip to content

Commit 0b27486

Browse files
luyahandanielleadams
authored andcommitted
deps: V8: cherry-pick e74d6918fb9f
Original commit message: [sparkplug] Simplify arch-guards to ENABLE_SPARKPLUG There is still a place to simplify. Bug: v8:11420, v8:11421 Change-Id: I774139c52d911323f162350532a493e70f518643 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3096885 Auto-Submit: Yahan Lu <yahan@iscas.ac.cn> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/master@{#76296} Refs: v8/v8@e74d6918fb9 PR-URL: #41566 Refs: v8/v8@d8dc66f Refs: v8/v8@3cab84c Refs: v8/v8@471f862 Refs: v8/v8@77599ff Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
1 parent 77ad5dd commit 0b27486

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.17',
39+
'v8_embedder_string': '-node.18',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/baseline/baseline-batch-compiler.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
// TODO(v8:11421): Remove #if once baseline compiler is ported to other
88
// architectures.
9-
#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || \
10-
V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_RISCV64 || V8_TARGET_ARCH_MIPS64 || \
11-
V8_TARGET_ARCH_MIPS
9+
#include "src/flags/flags.h"
10+
#if ENABLE_SPARKPLUG
1211

1312
#include "src/baseline/baseline-compiler.h"
1413
#include "src/codegen/compiler.h"

deps/v8/src/builtins/builtins-internal-gen.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,9 +1053,7 @@ void Builtins::Generate_MemMove(MacroAssembler* masm) {
10531053

10541054
// TODO(v8:11421): Remove #if once baseline compiler is ported to other
10551055
// architectures.
1056-
#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || \
1057-
V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_RISCV64 || V8_TARGET_ARCH_MIPS64 || \
1058-
V8_TARGET_ARCH_MIPS
1056+
#if ENABLE_SPARKPLUG
10591057
void Builtins::Generate_BaselineLeaveFrame(MacroAssembler* masm) {
10601058
EmitReturnBaseline(masm);
10611059
}

0 commit comments

Comments
 (0)