mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: cherry-pick f320600cd1f4 from v8 (#42124)
* chore: cherry-pick f320600cd1f4 from v8 * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
@@ -6,3 +6,4 @@ merged_wasm_add_bounds_check_in_tier-up_of_wasm-to-js_wrapper.patch
|
||||
merged_parser_fix_home_object_proxy_to_work_off-thread.patch
|
||||
merged_wasm_check_for_type-definition_count_limit.patch
|
||||
merged_runtime_recreate_enum_cache_on_map_update_if_any_previous.patch
|
||||
cherry-pick-f320600cd1f4.patch
|
||||
|
||||
27
patches/v8/cherry-pick-f320600cd1f4.patch
Normal file
27
patches/v8/cherry-pick-f320600cd1f4.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shu-yu Guo <syg@chromium.org>
|
||||
Date: Thu, 9 May 2024 12:03:28 -0700
|
||||
Subject: Only normalize JSObject targets in SetOrCopyDataProperties
|
||||
|
||||
Bug: 339458194
|
||||
Change-Id: I4d6eebdd921971fa28d7c474535d978900ba633f
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5527397
|
||||
Reviewed-by: Rezvan Mahdavi Hezaveh <rezvan@chromium.org>
|
||||
Commit-Queue: Shu-yu Guo <syg@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#93811}
|
||||
|
||||
diff --git a/src/objects/js-objects.cc b/src/objects/js-objects.cc
|
||||
index 22bdb5f91e78450591e077d742eef1a299409243..3cb60a339ad960e05c0e8f8b3996cb892a6aa881 100644
|
||||
--- a/src/objects/js-objects.cc
|
||||
+++ b/src/objects/js-objects.cc
|
||||
@@ -429,9 +429,7 @@ Maybe<bool> JSReceiver::SetOrCopyDataProperties(
|
||||
Nothing<bool>());
|
||||
|
||||
if (!from->HasFastProperties() && target->HasFastProperties() &&
|
||||
- !IsJSGlobalProxy(*target)) {
|
||||
- // JSProxy is always in slow-mode.
|
||||
- DCHECK(!IsJSProxy(*target));
|
||||
+ IsJSObject(*target) && !IsJSGlobalProxy(*target)) {
|
||||
// Convert to slow properties if we're guaranteed to overflow the number of
|
||||
// descriptors.
|
||||
int source_length;
|
||||
Reference in New Issue
Block a user