Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: re-enable partition alloc on mac #33981

Merged
merged 1 commit into from Oct 17, 2023
Merged

Conversation

VerteDinde
Copy link
Member

Description of Change

#33704 fixed a partition alloc-related crash in MacOS versions <= 10.15. With that crash fixed, we should be able to re-enable partition alloc!

This PR re-enables partition alloc on MacOS by removing the Chromium patch.

Checklist

Release Notes

Notes: Re-enabled partition alloc on Mac

@VerteDinde VerteDinde added semver/patch backwards-compatible bug fixes target/18-x-y labels Apr 29, 2022
@VerteDinde VerteDinde requested review from a team as code owners April 29, 2022 20:35
@VerteDinde VerteDinde removed the semver/patch backwards-compatible bug fixes label Apr 29, 2022
@deepak1556
Copy link
Member

Failing test would be a side-effect of #33832, needs further investigation.

@github-actions
Copy link
Contributor

github-actions bot commented Jul 29, 2022

electron-woa-testing

0 tests   0 ✔️  0s ⏱️
0 suites  0 💤
0 files    0

Results for commit 3b25115.

♻️ This comment has been updated with latest results.

@miniak miniak added target/21-x-y PR should also be added to the "21-x-y" branch. and removed target/18-x-y labels Sep 23, 2022
@jkleinsc jkleinsc added the target/22-x-y PR should also be added to the "22-x-y" branch. label Sep 28, 2022
@jkleinsc jkleinsc added the target/23-x-y PR should also be added to the "23-x-y" branch. label Nov 30, 2022
@jkleinsc jkleinsc added the target/24-x-y PR should also be added to the "24-x-y" branch. label Feb 9, 2023
@jkleinsc jkleinsc added target/25-x-y PR should also be added to the "25-x-y" branch. and removed target/21-x-y PR should also be added to the "21-x-y" branch. labels Apr 6, 2023
@github-actions github-actions bot added the target/26-x-y PR should also be added to the "26-x-y" branch. label May 31, 2023
@github-actions github-actions bot added the target/27-x-y PR should also be added to the "27-x-y" branch. label Aug 16, 2023
@zcbenz
Copy link
Member

zcbenz commented Oct 9, 2023

@VerteDinde With #40128 I think this PR should be ready to go, can you rebase it on main?

@zcbenz
Copy link
Member

zcbenz commented Oct 9, 2023

Also changing memory allocator is a bit dangerous and can potentially break things, I think we should at least not backport this change to stable branches.

@miniak miniak removed target/23-x-y PR should also be added to the "23-x-y" branch. target/22-x-y PR should also be added to the "22-x-y" branch. labels Oct 9, 2023
@zcbenz zcbenz added no-backport target/28-x-y PR should also be added to the "28-x-y" branch. and removed wip ⚒ target/25-x-y PR should also be added to the "25-x-y" branch. target/26-x-y PR should also be added to the "26-x-y" branch. target/27-x-y PR should also be added to the "27-x-y" branch. target/28-x-y PR should also be added to the "28-x-y" branch. no-backport labels Oct 16, 2023
@zcbenz zcbenz marked this pull request as ready for review October 16, 2023 05:04
@zcbenz zcbenz requested a review from a team as a code owner October 16, 2023 05:04
@zcbenz zcbenz added semver/patch backwards-compatible bug fixes and removed semver/none labels Oct 16, 2023
@deepak1556 deepak1556 merged commit f65d1f3 into main Oct 17, 2023
21 checks passed
@deepak1556 deepak1556 deleted the reenable-partition-alloc branch October 17, 2023 02:18
@release-clerk
Copy link

release-clerk bot commented Oct 17, 2023

Release Notes Persisted

Re-enabled partition alloc on Mac

@trop
Copy link
Contributor

trop bot commented Oct 17, 2023

I have automatically backported this PR to "28-x-y", please check out #40230

@trop trop bot added in-flight/28-x-y merged/28-x-y PR was merged to the "28-x-y" branch. and removed target/28-x-y PR should also be added to the "28-x-y" branch. in-flight/28-x-y labels Oct 17, 2023
felixrieseberg pushed a commit to felixrieseberg/electron that referenced this pull request Oct 25, 2023
chase added a commit to coparse-inc/electron-libreoffice that referenced this pull request Oct 27, 2023
There are several cases we've encountered where allocs and frees don't
match the correct allocator when going from Electron to LibreOfficeKit,
causing crashes. Usually an allocaiton is preformed in LOK with the
system default allocator but then Electron tries to free it with the
partition allocator. This is already disabled on macOS by default so
disabling it for Windows and Linux doesn't really change much.

They only just re-enabled partition alloc on Mac last week anyway:
electron/electron#33981
MrHuangJser pushed a commit to MrHuangJser/electron that referenced this pull request Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged/28-x-y PR was merged to the "28-x-y" branch. semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants