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

Rollup of 5 pull requests #61153

Closed
wants to merge 22 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 25, 2019

Successful merges:

Failed merges:

r? @ghost

michaelwoerister and others added 22 commits May 22, 2019 13:04
This function is hot for `keccak`.
Most involving `Symbol::intern` on string literals.
Because this function is hot.

Also remove the dead `ty_option` function.
The commit should have changed comments as well.
At the time of writting, it passes the tidy and check tool.

Revisions asked by eddyb :
- Renamed of all the occurences of {visit/super}_mir
- Renamed test structures `CachedMir` to `Cached`

Fixing the missing import on `AggregateKind`
It's just a waste of memory. This also gets rid of the special case for
"".
Changes the type `mir::Mir` into `mir::Body`

Fixes part 1 of rust-lang#60229 (previously attempted in rust-lang#60242).

I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date.

The commit should have changed comments as well.
At the time of writting, it passes the tidy and check tool.
…ning, r=petrochenkov

Avoid more symbol interning

r? @petrochenkov
…lexcrichton

PGO - Add a smoketest for combining PGO with cross-language LTO.

This PR

- Adds a test making sure that PGO can be combined with cross-language LTO.
- Does a little cleanup on how the `pgo-use` flag is handled internally.
- Makes the compiler error if the `pgo-use` file given to `rustc` doesn't actually exist. LLVM only gives a warning and then just doesn't do PGO. Clang, on the other hand, does give an error in this case.
- Makes the build system also build `compiler-rt` when building LLDB. This way the Clang compiler that we get from building LLDB can perform PGO, which is something that the new test case wants to do. CI compile times shouldn't be affected too much.
…henkov

Don't arena-allocate static symbols.

It's just a waste of memory. This also gets rid of the special case for
"".

r? @petrochenkov
Ship profiler with windows-gnu

Fixes rust-lang#49409

I don't know if we can enable it for testing, windows-gnu jobs are already taking too long: rust-lang#59637.

r? @michaelwoerister

P.S.
I have tested only x86_64 build.
@Centril
Copy link
Contributor Author

Centril commented May 25, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented May 25, 2019

📌 Commit c907f03 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 25, 2019
@mark-i-m
Copy link
Member

That's a lot of rollup PRs 🎢

@Centril
Copy link
Contributor Author

Centril commented May 25, 2019

Yep 🚀

@Centril
Copy link
Contributor Author

Centril commented May 25, 2019

Unfortunately I have to build LLVM locally for all of them, a bummer.

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019
Rollup of 5 pull requests

Successful merges:

 - rust-lang#60928 (Changes the type `mir::Mir` into `mir::Body`)
 - rust-lang#61035 (Avoid more symbol interning)
 - rust-lang#61036 (PGO - Add a smoketest for combining PGO with cross-language LTO.)
 - rust-lang#61077 (Don't arena-allocate static symbols.)
 - rust-lang#61080 (Ship profiler with windows-gnu)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 25, 2019

☔ The latest upstream changes (presumably #60441) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 25, 2019
@Centril Centril closed this May 25, 2019
@Centril Centril deleted the rollup-b9qpiez branch May 25, 2019 04:26
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants