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

Rollup of 5 pull requests #61155

Closed
wants to merge 22 commits into from
Closed

Rollup of 5 pull requests #61155

wants to merge 22 commits into from

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
@michaelwoerister
Use a PathBuf instead of String for representing the pgo-use path int…
e349f8f 
…ernally.
@michaelwoerister
PGO: Check that pgo-use file actually exists. LLVM seems to only emit…
01a59a3 
… an easy-to-overlook warning otherwise.
@michaelwoerister
rustbuild: Also build compiler-rt when building LLDB. This allows cla…
b1f27fa 
…ng-based run-make tests to use PGO.
@michaelwoerister
Add a smoketest for combining PGO with xLTO.
51463d0
@michaelwoerister
Fix unit test after pgo-use change.
b3c5cdd
@mati865
Ship profiler with windows-gnu
1a35a1c
@nnethercote
Avoid interning in resolve_place_op.
45e9d8e 
This function is hot for `keccak`.
@nnethercote
Avoid unnecessary internings.
f9c4a90 
Most involving `Symbol::intern` on string literals.
@nnethercote
Pass symbols to ExtCtxt::std_path instead of strings.
2fab5d6 
Because this function is hot.

Also remove the dead `ty_option` function.
@nnethercote
Pre-intern "0", "1", ..., "9", and use where appropriate.
c040b3b
@nnethercote
Add ty_to_symbol methods.
eb962c2
@nnethercote
Avoid some re-interning in to_lit_token.
babd1a1
@nnethercote
Use Symbol equality in is_ident_named.
54c8725
@nnethercote
Use Symbol equality in check_ident_token.
c389116
@nnethercote
Use Symbol equality in may_begin_with and parse_nt.
71920d3
@nnethercote
Don't arena-allocate static symbols.
e396f99 
It's just a waste of memory. This also gets rid of the special case for
"".
@aristocles-deploy
Fix spelling in release notes
fd19989
@Centril
Rollup merge of rust-lang#61035 - nnethercote:avoid-more-symbol-inter…
ad0d136 
…ning, r=petrochenkov

Avoid more symbol interning

r? @petrochenkov
@Centril
Rollup merge of rust-lang#61036 - michaelwoerister:pgo-xlto-test, r=a…
04f81f2 
…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.
@Centril
Rollup merge of rust-lang#61077 - nnethercote:tweak-prefill, r=petroc…
bc235ee 
…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
@Centril
Rollup merge of rust-lang#61080 - mati865:mingw_pgo, r=sanxiyn
e6eaff6 
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
Rollup merge of rust-lang#61149 - vishalsodani:master, r=Centril
5c60c50 
Fix spelling in release notes
@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 5c60c50 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
@bors
Copy link
Contributor

bors commented May 25, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-rh5cd2y (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-rh5cd2y --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/libsyntax_ext/asm.rs
Auto-merging src/libsyntax/parse/parser.rs
Auto-merging src/libsyntax/ext/tt/macro_rules.rs
Auto-merging src/libsyntax/ext/tt/macro_parser.rs
Auto-merging src/libsyntax/ext/base.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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
Copy link
Contributor Author

Centril commented May 25, 2019

OK... this makes no sense; I tested all 3 rollups in a single PR and there were no conflicts.

@Centril Centril closed this May 25, 2019
@Centril Centril deleted the rollup-rh5cd2y branch May 25, 2019 09:28
@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
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Centril @bors @michaelwoerister @mati865 @nnethercote @aristocles-deploy