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 7 pull requests #59692

Closed
wants to merge 21 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 4, 2019

Successful merges:

Failed merges:

r? @ghost

czipperz and others added 21 commits March 27, 2019 16:37
Functions with uninhabited return values are already marked `noreturn`,
but we were still generating return instructions for this. When running
with `-C passes=lint`, LLVM prints:

    Unusual: Return statement in function with noreturn attribute

The LLVM manual makes a stronger statement about `noreturn` though:

> This produces undefined behavior at runtime if the function ever does
dynamically return.

We now emit an `abort` anywhere that would have tried to return an
uninhabited value.
…dtolnay

Document std::fs::File close behavior ignoring errors

Resolves rust-lang#52685
`as_deref()` and `as_deref_mut()` impls

addresses rust-lang#50264
renamed `deref()` -> `as_deref()`
added `deref_mut()` impls + tests
fixed breaking changes
Never return uninhabited values at all

Functions with uninhabited return values are already marked `noreturn`,
but we were still generating return instructions for this. When running
with `-C passes=lint`, LLVM prints:

    Unusual: Return statement in function with noreturn attribute

The LLVM manual makes a stronger statement about `noreturn` though:

> This produces undefined behavior at runtime if the function ever does
dynamically return.

We now emit an `abort` anywhere that would have tried to return an
uninhabited value.

Fixes rust-lang#48227
cc rust-lang#7463 rust-lang#48229

r? @eddyb
Add description for -Os and -Oz in rustc.1
… r=luqmana

Temporarily disable stack probing for gnux32.
@Centril
Copy link
Contributor Author

Centril commented Apr 4, 2019

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Apr 4, 2019

📌 Commit 03a6ae6 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 4, 2019
@bors
Copy link
Contributor

bors commented Apr 4, 2019

⌛ Testing commit 03a6ae6 with merge 301460c95ccbb910a34ca864cdfbb6157c7ecda8...

@bors
Copy link
Contributor

bors commented Apr 4, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:31:36] [RUSTC-TIMING] miri test:false 86.660
[01:31:37] error[E0599]: no method named `deref` found for type `std::option::Option<std::string::String>` in the current scope
[01:31:37]    --> src/tools/miri/src/bin/cargo-miri.rs:296:60
[01:31:37]     |
[01:31:37] 296 |     let (subcommand, skip) = match std::env::args().nth(2).deref() {
[01:31:37] 
[01:31:37] error: aborting due to previous error
[01:31:37] 
[01:31:37] For more information about this error, try `rustc --explain E0599`.
---
[01:31:51] This PR updated 'src/tools/miri', verifying if status is 'test-pass'...
[01:31:51] 
[01:31:51] ⚠️ We detected that this PR updated 'miri', but its tests failed.
[01:31:51] 
[01:31:51] If you do intend to update 'miri', please check the error messages above and
[01:31:51] commit another update.
[01:31:51] 
[01:31:51] If you do NOT intend to update 'miri', please ensure you did not accidentally
[01:31:51] change the submodule at 'src/tools/miri'. You may ask your reviewer for the
[01:31:51] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:143c473c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Apr  4 12:45:54 UTC 2019
---
travis_time:end:2a853a1c:start=1554381955758529168,finish=1554381955770707674,duration=12178506
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0130c5f9
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:146fcf07
travis_time:start:146fcf07
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:09fd8528
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@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 4, 2019
@Centril Centril closed this Apr 4, 2019
@Centril Centril deleted the rollup-dqzw6qg branch April 4, 2019 12:49
@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-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants