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.

Sign up for GitHub

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

Jump to bottom

disable jemalloc on executables for ios targets #46211

Merged
merged 2 commits into from
Dec 1, 2017
Merged

disable jemalloc on executables for ios targets #46211

merged 2 commits into from
Dec 1, 2017
+4 −0

Conversation

kali
Copy link
Contributor

@kali kali commented Nov 23, 2017

This is a (temporary ?) workaround for issue #45262

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 23, 2017
@carols10cents
Copy link
Member

Review ping for you @pnkfelix !

pnkfelix
pnkfelix reviewed Nov 27, 2017
View reviewed changes
src/librustc_back/target/apple_ios_base.rs Outdated
@@ -99,6 +99,7 @@ pub fn opts(arch: Arch) -> Result<TargetOptions, String> {
executables: true,
pre_link_args,
has_elf_tls: false,
exe_allocation_crate: None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kali can you add a comment noting that this new line can be removed after Rust upgrades to a sufficiently new version of jemalloc (and mention #45262 in the comment)?

Thanks!

@pnkfelix
Copy link
Member

r=me once the comment I requested above has been added.

@pnkfelix pnkfelix added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 27, 2017
@sfackler
Copy link
Member

@bors r=pnkfelix

@bors
Copy link
Contributor

bors commented Nov 30, 2017

📌 Commit 3b18e29 has been approved by pnkfelix

@sfackler sfackler added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 30, 2017
@sfackler
Copy link
Member

@alexcrichton thoughts on backporting to beta? Seems like it'd be nice to fix iOS bins earlier rather than later and it should be low risk.

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 30, 2017
@alexcrichton
Copy link
Member

Sure!

@bors
Copy link
Contributor

bors commented Dec 1, 2017

⌛ Testing commit 3b18e29 with merge 315fbf7...

bors added a commit that referenced this pull request Dec 1, 2017
@bors
Auto merge of #46211 - snipsco:master, r=pnkfelix
315fbf7 
disable jemalloc on executables for ios targets

This is a (temporary ?) workaround for issue #45262
@bors
Copy link
Contributor

bors commented Dec 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 315fbf7 to master...

@bors bors merged commit 3b18e29 into rust-lang:master Dec 1, 2017
This was referenced Dec 21, 2017
Closed
Merged
bors added a commit that referenced this pull request Dec 23, 2017
@bors
Auto merge of #46912 - pnkfelix:backport-46211-to-beta, r=kennytm
2b55e35 
Backport to beta: disable jemalloc on executables for ios targets

Back port of #46211
@alexcrichton
Copy link
Member

Looks like we forgot to backport to 1.23.0 (sorry about that!) so removing the beta tags.

@alexcrichton alexcrichton removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 10, 2018
@SimonSapin SimonSapin mentioned this pull request Jun 13, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pnkfelix pnkfelix pnkfelix left review comments

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@kali @rust-highfive @carols10cents @pnkfelix @sfackler @bors @alexcrichton @kennytm