Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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
  • Loading branch information
luyahan committed Jan 17, 2022
commit 81e50d8a46f93b7d459d049b554653ff8d6a3758
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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.17',
'v8_embedder_string': '-node.18',

##### V8 defaults for Node.js #####

Expand Down
5 changes: 2 additions & 3 deletions deps/v8/src/baseline/baseline-batch-compiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@

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

#include "src/baseline/baseline-compiler.h"
#include "src/codegen/compiler.h"
Expand Down
4 changes: 1 addition & 3 deletions deps/v8/src/builtins/builtins-internal-gen.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1053,9 +1053,7 @@ void Builtins::Generate_MemMove(MacroAssembler* masm) {

// TODO(v8:11421): Remove #if once baseline compiler is ported to other
// architectures.
#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || \
V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_RISCV64 || V8_TARGET_ARCH_MIPS64 || \
V8_TARGET_ARCH_MIPS
#if ENABLE_SPARKPLUG
void Builtins::Generate_BaselineLeaveFrame(MacroAssembler* masm) {
EmitReturnBaseline(masm);
}
Expand Down