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 #71295

Closed
wants to merge 17 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 17 commits April 2, 2020 16:50
…g had content there before the current changes
This renaming was already done in some modules via import renaming. It's strictly used as a context, and it contains a `TyCtxt`.
…Jung

Const check/promotion cleanup and sanity assertion

r? @RalfJung

This is just the part of rust-lang#70042 (comment) that does not change behaviour
…r=Xanewok

Remove unused abs_path method from rustc_span::source_map::FileLoader
Move `MapInPlace` to rustc_data_structures

Follow-up of rust-lang#67786, it fits the purpose of rustc_data_structures.
r? @petrochenkov
Minor improvements to -Zprofile

- `-Zprofile` is broken with codegen units because GCOV assumes that each source file corresponds to one object file. This PR makes `-Zprofile` automatically set codegen units to 1 and gives an error if `-Ccodegen-units=X` is specified on the command line (with `X != 1`).
- The `profiler_builtins` crate is not suitable for `no_std` applications since it contains C code that depends on libc. In such cases a custom implementation of the LLVM gcov API (`llvm_gcov_init`, `llvm_gcda_*`) is needed. This PR adds `-Zno-profiler-runtime` flag which inhibits automatic injection of the `profiler_builtins` crate.

cc @whitequark who implemented the original `-Zprofile` support
Explain why we shouldn't add inline attr to into_vec

Follow-up of rust-lang#71204
r? @RalfJung
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Apr 18, 2020

📌 Commit ae0805a has been approved by Dylan-DPC

@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 Apr 18, 2020
@bors
Copy link
Contributor

bors commented Apr 18, 2020

⌛ Testing commit ae0805a with merge c7c4d18a1b30fdbed5eb21d27535ab1a1e2e18cf...

@bors
Copy link
Contributor

bors commented Apr 18, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Apr 18, 2020
@JohnTitor JohnTitor closed this Apr 18, 2020
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-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants