Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,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.52',
'v8_embedder_string': '-node.53',

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

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/maglev/maglev-code-gen-state.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include "src/codegen/label.h"
#include "src/codegen/machine-type.h"
#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/compiler/backend/instruction.h"
#include "src/compiler/js-heap-broker.h"
Expand All@@ -34,9 +35,11 @@ class MaglevCodeGenState {
public:
MaglevCodeGenState(MaglevCompilationInfo* compilation_info,
MaglevSafepointTableBuilder* safepoint_table_builder,
SourcePositionTableBuilder* source_position_table_builder,
uint32_t max_block_id)
: compilation_info_(compilation_info),
safepoint_table_builder_(safepoint_table_builder),
source_position_table_builder_(source_position_table_builder),
real_jump_target_(max_block_id) {}

void set_tagged_slots(int slots) { tagged_slots_ = slots; }
Expand DownExpand Up@@ -80,6 +83,9 @@ class MaglevCodeGenState {
MaglevSafepointTableBuilder* safepoint_table_builder() const {
return safepoint_table_builder_;
}
SourcePositionTableBuilder* source_position_table_builder() const {
return source_position_table_builder_;
}
MaglevCompilationInfo* compilation_info() const { return compilation_info_; }

Label* entry_label() { return &entry_label_; }
Expand DownExpand Up@@ -121,6 +127,7 @@ class MaglevCodeGenState {
private:
MaglevCompilationInfo* const compilation_info_;
MaglevSafepointTableBuilder* const safepoint_table_builder_;
SourcePositionTableBuilder* const source_position_table_builder_;

std::vector<DeferredCodeInfo*> deferred_code_;
std::vector<EagerDeoptInfo*> eager_deopts_;
Expand Down
28 changes: 25 additions & 3 deletions deps/v8/src/maglev/maglev-code-generator.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -707,7 +707,14 @@ class ExceptionHandlerTrampolineBuilder {
class MaglevCodeGeneratingNodeProcessor {
public:
MaglevCodeGeneratingNodeProcessor(MaglevAssembler* masm, Zone* zone)
: masm_(masm), zone_(zone) {}
: masm_(masm),
zone_(zone),
// Cache for faster check.
collect_source_positions_(masm->code_gen_state()
->compilation_info()
->collect_source_positions()) {
DCHECK_IMPLIES(collect_source_positions_, graph_labeller() != nullptr);
}

void PreProcessGraph(Graph* graph) {
// TODO(victorgomes): I wonder if we want to create a struct that shares
Expand DownExpand Up@@ -800,6 +807,15 @@ class MaglevCodeGeneratingNodeProcessor {
<< PrintNode(graph_labeller(), node);
__ RecordComment(ss.str());
}
if (collect_source_positions_) {
// TODO(leszeks): Consider collecting source position in a more memory
// friendly way, if we don't need the whole graph labeller.
const auto& provenance = graph_labeller()->GetNodeProvenance(node);
if (provenance.position.IsKnown()) {
code_gen_state()->source_position_table_builder()->AddPosition(
masm_->pc_offset(), provenance.position, false);
}
}

if (v8_flags.maglev_assert_stack_size) {
__ AssertStackSizeCorrect();
Expand DownExpand Up@@ -1105,6 +1121,7 @@ class MaglevCodeGeneratingNodeProcessor {
}
MaglevAssembler* const masm_;
Zone* zone_;
bool collect_source_positions_;
};

class SafepointingNodeProcessor {
Expand DownExpand Up@@ -1695,8 +1712,9 @@ MaglevCodeGenerator::MaglevCodeGenerator(
safepoint_table_builder_(compilation_info->zone(),
graph->tagged_stack_slots()),
frame_translation_builder_(compilation_info->zone()),
source_position_table_builder_(compilation_info->zone()),
code_gen_state_(compilation_info, &safepoint_table_builder_,
graph->max_block_id()),
&source_position_table_builder_, graph->max_block_id()),
masm_(isolate->GetMainThreadIsolateUnsafe(), compilation_info->zone(),
&code_gen_state_),
graph_(graph),
Expand DownExpand Up@@ -1919,6 +1937,10 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
LocalIsolate* local_isolate) {
if (!code_gen_succeeded_) return {};

// Allocate the source position table.
Handle<TrustedByteArray> source_positions =
source_position_table_builder_.ToSourcePositionTable(local_isolate);

Handle<DeoptimizationData> deopt_data =
(v8_flags.maglev_deopt_data_on_background &&
!v8_flags.maglev_build_code_on_background)
Expand All@@ -1934,7 +1956,7 @@ MaybeHandle<Code> MaglevCodeGenerator::BuildCodeObject(
.set_stack_slots(stack_slot_count_with_fixed_frame())
.set_parameter_count(parameter_count())
.set_deoptimization_data(deopt_data)
.set_empty_source_position_table()
.set_source_position_table(source_positions)
.set_inlined_bytecode_size(graph_->total_inlined_bytecode_size())
.set_osr_offset(
code_gen_state_.compilation_info()->toplevel_osr_offset());
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/maglev/maglev-code-generator.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#define V8_MAGLEV_MAGLEV_CODE_GENERATOR_H_

#include "src/codegen/maglev-safepoint-table.h"
#include "src/codegen/source-position-table.h"
#include "src/common/globals.h"
#include "src/deoptimizer/frame-translation-builder.h"
#include "src/maglev/maglev-assembler.h"
Expand DownExpand Up@@ -54,6 +55,7 @@ class MaglevCodeGenerator final {
LocalIsolate* local_isolate_;
MaglevSafepointTableBuilder safepoint_table_builder_;
FrameTranslationBuilder frame_translation_builder_;
SourcePositionTableBuilder source_position_table_builder_;
MaglevCodeGenState code_gen_state_;
MaglevAssembler masm_;
Graph* const graph_;
Expand Down
12 changes: 12 additions & 0 deletions deps/v8/src/maglev/maglev-compiler.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,18 @@ bool MaglevCompiler::Compile(LocalIsolate* local_isolate,
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

// When collecting source positions for profiling, create a graph labeller
// so per-node provenance (including inlined positions) is recorded during
// graph building and a real source position table can be attached to the
// Code object.
// Upstream V8 folds this into the single graph-labeller condition; node's
// V8 creates the labeller in a differently-shaped block, so the condition
// is added separately here.
if (compilation_info->collect_source_positions() &&
!compilation_info->has_graph_labeller()) {
compilation_info->set_graph_labeller(new MaglevGraphLabeller());
}

if (is_tracing_enabled &&
(v8_flags.print_maglev_code || v8_flags.print_maglev_graph ||
v8_flags.print_maglev_graphs || v8_flags.trace_maglev_graph_building ||
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class MaglevAssemblerTest : public MaglevTest {
public:
MaglevAssemblerTest()
: MaglevTest(),
codegen_state(nullptr, nullptr, 0),
codegen_state(nullptr, nullptr, nullptr, 0),
as(isolate(), zone(), &codegen_state) {}

void FinalizeAndRun(Label* pass, Label* fail) {
Expand Down