chore: cherry-pick 2 changes from 1-M137#47369
Merged
codebytere merged 3 commits into35-x-yfrom Jun 5, 2025
Merged
Conversation
codebytere
approved these changes
Jun 4, 2025
|
Release Notes Persisted
|
12 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
electron/security#676 - 45eb42cd398e from v8
[turbofan] Convert Smi to Word64 using zero extension... when a known type range contains only positive values.
Bug: 420637585
Change-Id: I8d9bb3f2fe2e5268e1659bb4ea7bbf97bfb52288
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6594731
Reviewed-by: Nico Hartmann nicohartmann@chromium.org
Commit-Queue: Igor Sheludko ishell@chromium.org
Cr-Commit-Position: refs/heads/main@{#100538}
Notes: Backported fix for 420637585.
electron/security#677 - f1e6422a355c from chromium
Enforce SharedWorker::Terminate() procedure orderDuring the investigation of crbug.com/409059706, we observed that
PerformShutdownOnWorkerThread() is called during the status is
running.
I suppose the root cause is race condition between
Terminate()procedure and a child process termination procedure in different
thread. WorkerThread can be terminated if two conditions are met;
Terminate()is called and all child worker threads have beenterminated. Both
Terminate()and the child process terminationprocedure may call
PerformShutdownOnWorkerThread(), and formeris executed regardless of two conditions are met. The latter
is called if
Terminate()is called and no child processes.To be clear, "
Terminate()is called" does not meanPrepareForShutdownOnWorkerThread()is executed.Terminate()queues it after the flag to tell
Terminate()call. And, whenthe issue happen, I am quite sure the flag is set but,
PrepareForShutdownOnWorkerThread()won't be executed yet.The fix is that:
The flag is used for two purpose; a. avoid re-enter of
Terminate(), and b.PrepareForShutdownOnWorkerThread()isin flight. The CL changed the flag to enum to represent
the stage properly.
PerformShutdownOnWorkerThread()is queued even if it iscalled within the child process termination procedure.
It avoid the execution order flip between
PrepareForShutdownOnWorkerThread()andPerformShutdownOnWorkerThread().In addition, this change ensures
PerformShutdownOnWorkerThread()is called once. While
PerformShutdownOnWorkerThread()touchesfields inside, the fields must not be touched at some point within
the function, the function is actually not re-entrant when it reaches
to the end. Upon mikt@ suggestion, I made
PerformShutdownOnWorkerThread()is called only when two conditionsare fulfilled. i.e.
Terminate()is called and the number of childthreads is 0. Also, the CL uses the enum to show
PerformShutdownOnWorkerThread()is in-flight to avoid re-entrancein this level.
Bug: 409059706
Change-Id: I81a1c3b1a34e827fa75ec2d1a9b37023965dbe27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6543412
Reviewed-by: Hiroki Nakagawa nhiroki@chromium.org
Commit-Queue: Yoshisato Yanagisawa yyanagisawa@chromium.org
Cr-Commit-Position: refs/heads/main@{#1463892}
Notes: