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 6 pull requests #70878

Closed
wants to merge 27 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 7, 2020

Successful merges:

Failed merges:

r? @ghost

jclulow and others added 27 commits April 1, 2020 23:39
LLVM will insert calls to the stack protector functions
"__stack_chk_fail" and "__stack_chk_guard" into code in native object
files.  Some platforms include these symbols directly in libc, but at
least historically these have been provided in libssp.so on illumos and
Solaris systems.  Include "-lssp" in the arguments to the linker when
building for those targets.
It appears to codegen slightly more efficiently with `split_at` taking
two slices at once, rather than slicing across different calls.
It can try to keep its allocation by converting the inner `Box` to
`Vec`, using `clone_into` on the bytes, then convert back to `Box`.
Despite OS differences, they're all just `Vec<u8>` inside, so we can
just forward `clone_into` calls to that optimized implementation.
Small tweaks in ToOwned::clone_into

- `<[T]>::clone_into` is slightly more optimized.
- `CStr::clone_into` is new, letting it reuse its allocation.
- `OsStr::clone_into` now forwards to the underlying slice/`Vec`.
link with "libssp" on *-sun-solaris systems

LLVM will insert calls to the stack protector functions
"__stack_chk_fail" and "__stack_chk_guard" into code in native object
files.  Some platforms include these symbols directly in libc, but at
least historically these have been provided in libssp.so on illumos and
Solaris systems.  Include "-lssp" in the arguments to the linker when
building for those targets.
Miri leak check: memory reachable through globals is not leaked

Also make Miri memory dump prettier by sharing more code with MIR dumping, and fix a bug where the Miri memory dump would print some allocations twice.

r? @oli-obk

Miri PR: rust-lang/miri#1301
…nits, r=alexcrichton

Keep codegen units unmerged when building compiler builtins

Make it possible to control how mono items are partitioned into code generation
units, when compiling the compiler builtins, by retaining the original partitioning.

Helps with rust-lang#48625, rust-lang#61063, rust-lang#67960, rust-lang#70489.

r? @alexcrichton
…tolnay

Use assoc int submodules

Bumping some submodules to the commits their masters currently point at. The main point of this is to get the associated integer/float constant documentation updates that were recently merged to them:

* rust-lang/nomicon#207
* rust-lang/rust-by-example#1327
* rust-lang/stdarch#848

But for some, a few more changes slipped by that happened to be in the master branch of these submodules.

r? @dtolnay
…=dtolnay

Don't import integer and float modules, use assoc consts 2

Follow up to rust-lang#70777. I missed quite a lot of places. Partially because I wanted to keep the size of the last PR down, and partially because my regexes were not good enough :)

r? @dtolnay
@Centril
Copy link
Contributor Author

Centril commented Apr 7, 2020

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Apr 7, 2020

📌 Commit 17c5a81 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 Apr 7, 2020
@Centril Centril added the rollup A PR which is a rollup label Apr 7, 2020
@bors
Copy link
Contributor

bors commented Apr 7, 2020

⌛ Testing commit 17c5a81 with merge 9508dc8afc99a3c9dff35dda9a33df26dbfcbd52...

@bors
Copy link
Contributor

bors commented Apr 7, 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 7, 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.

8 participants