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 0c11feeeca4a
Original commit message:

    [turboshaft][tsa] specify namespace for Block

    It is ambiguous otherwise. There is `v8::internal::Block` and
    `v8::internal::compiler::turboshaft::Block`.
    This change is also consistent with the other types used in the macro.

    Change-Id: Ica7e5a09de955d8f38756fe26ab5f7e93e7e16e2
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5878257
    Reviewed-by: Camillo Bruni <[email protected]>
    Commit-Queue: Michaël Zasso <[email protected]>
    Reviewed-by: Igor Sheludko <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#96278}

Refs: v8/v8@0c11fee
  • Loading branch information
targos committed Jan 30, 2025
commit 043202ccee21f1fe8f8232f193918f8255cac7a7
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.7',
'v8_embedder_string': '-node.8',

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

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/interpreter/interpreter-generator-tsa.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace compiler::turboshaft; // NOLINT(build/namespaces)
compiler::turboshaft::Graph& graph, Zone* zone) { \
Name##AssemblerTS assembler(data, isolate, graph, zone); \
assembler.EmitBytecodeHandlerProlog(); \
Block* catch_block = assembler.NewBlock(); \
compiler::turboshaft::Block* catch_block = assembler.NewBlock(); \
Name##AssemblerTS::CatchScope catch_scope(assembler, catch_block); \
assembler.Generate##Name##Impl(); \
assembler.EmitEpilog(catch_block); \
Expand Down