github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 1 changes from 1-M134 (#46012)

Browse Source 
chore: [33-x-y] cherry-pick 1 changes from 1-M134

* 2b4812d502b2 from v8

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Pedro Pontes
2025-03-13 18:08:30 +00:00
committed by GitHub
parent 4ef9f87d29
commit 4f0b230754
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/v8/.patches
View File

@@ -14,3 +14,4 @@ wasm_fix_freeing_of_identical_shared_wrappers.patch
merged_wasm_replace_dead_code_set_with_is_dying_bit.patch
merged_fix_out_of_bound_string_access.patch
cherry-pick-91343bb45c78.patch
cherry-pick-2b4812d502b2.patch

38
patches/v8/cherry-pick-2b4812d502b2.patch Normal file
View File

@@ -0,0 +1,38 @@
From 2b4812d502b2bbd2eeace4d383dd1bb3252702ba Mon Sep 17 00:00:00 2001
From: Olivier Flückiger <olivf@chromium.org>
Date: Thu, 27 Feb 2025 09:19:22 +0100
Subject: [PATCH] merged: [maglev] Add missing ClearAllocationBlock
Fixed: 398065918
(cherry picked from commit eb9b25970b0ad4a3f8ce23d8de3583c62e5d6b87)
Change-Id: I20f3979984c1df11509f1630cf4c4c4460d6a83a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6304712
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Auto-Submit: Olivier Flückiger <olivf@chromium.org>
Commit-Queue: Olivier Flückiger <olivf@chromium.org>
Commit-Queue: Victor Gomes <victorgomes@chromium.org>
Cr-Commit-Position: refs/branch-heads/13.4@{#29}
Cr-Branched-From: 0f87a54dade4353b6ece1d7591ca8c66f90c1c93-refs/heads/13.4.114@{#1}
Cr-Branched-From: 27af2e9363b2701abc5f3feb701b1dad7d1a9fe8-refs/heads/main@{#98459}
---
diff --git a/src/maglev/maglev-graph-builder.cc b/src/maglev/maglev-graph-builder.cc
index bf6a86f..1535afc 100644
--- a/src/maglev/maglev-graph-builder.cc
+++ b/src/maglev/maglev-graph-builder.cc
@@ -12487,7 +12487,13 @@
CreateHeapNumber(node->Cast<Float64Constant>()->value()),
allocation_type);
} else {
- node = GetTaggedValue(node);
+ ValueNode* new_node = GetTaggedValue(node);
+ if (new_node != node && new_node->properties().can_allocate()) {
+ // TODO(olivf): Remove this and instead always clear when we
+ // emit an allocating instruction.
+ ClearCurrentAllocationBlock();
+ }
+ node = new_node;
}
values[i] = node;
}