-
Notifications
You must be signed in to change notification settings - Fork 15.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
1 parent
19d3d66
commit c89546b
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |