Skip to content
Merged
Prev Previous commit
Next Next commit
Merge upstream/main into inverted_flamegraph
Resolved conflicts:
- flamegraph.js: Combined opcode mapping initialization with inverted flamegraph setup
- heatmap.css: Kept heatmap-specific toggle overrides (base toggle styles in base.css)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <[email protected]>
  • Loading branch information
pablogsal and claude committed Dec 11, 2025
commit 14f0ec82336b44dba52b0cd73f75b47d27bcad07
3 changes: 3 additions & 0 deletions Lib/profiling/sampling/_flamegraph_assets/flamegraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,9 @@ function initFlamegraph() {
normalData = EMBEDDED_DATA;
}

// Initialize opcode mapping from embedded data
initOpcodeMapping(EMBEDDED_DATA);

// Inverted data will be built on first toggle
invertedData = null;

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.