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

Merged
merged 12 commits into from
Apr 19, 2020
Merged

Rollup of 5 pull requests #71306

merged 12 commits into from
Apr 19, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

Amanieu and others added 12 commits April 17, 2020 19:53
Code blocks that are not annotated are assumed to be Rust
Move `MapInPlace` to rustc_data_structures

Follow-up of rust-lang#67786, it fits the purpose of rustc_data_structures.
r? @petrochenkov
…ic-morse

miri-unleashed: test that we detect heap allocations

This removes the second-to-last use of `IS_SUPPORTED_IN_MIRI = false`.

r? @ecstatic-morse @oli-obk
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
remove build warnings

Code blocks that are not annotated are assumed to be Rust
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 18, 2020

📌 Commit f6fb931 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 f6fb931 with merge 8001b96...

@bors
Copy link
Contributor

bors commented Apr 19, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 8001b96 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2020
@bors bors merged commit 8001b96 into rust-lang:master Apr 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants