Rollup of 6 pull requests by Dylan-DPC-zz · Pull Request #71467 · rust-lang/rust

Dylan-DPC-zz · 2020-04-23T13:57:21Z

Successful merges:

Reading from the return place is fine #71005 (Reading from the return place is fine)
Const check/promotion cleanup and sanity assertion #71198 (Const check/promotion cleanup and sanity assertion)
Improve E0308 error message wording again #71396 (Improve E0308 error message wording again)
Remove outdated reference to interpreter snapshotting #71452 (Remove outdated reference to interpreter snapshotting)
Inline some function docs in core::ptr #71454 (Inline some function docs in core::ptr)
Improve E0567 explanation #71461 (Improve E0567 explanation)

Failed merges:

Copy its value to the `return_place` upon leaving a call frame

Mostly renamed allocations, but I'm not sure about the const prop tests

…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`.

@oli-obk

…n, r=oli-obk Reading from the return place is fine Const eval thinks that reading from local `_0` is UB, but it isn't. `_0` is just a normal local like any other, and codegen handles it that way too. The only special thing is that the `Return` terminator will read from it. I've hit these errors while working on an NRVO pass that can merge other locals with `_0` in rust-lang#71003. r? @oli-obk

@RalfJung

…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

…bank Improve E0308 error message wording again Hello again, I recently did this PR: rust-lang#70242 I felt the error message could be further improved, so I made [a post on the Rust community forum](https://users.rust-lang.org/t/looking-for-feedback-on-an-improved-error-message-for-e0308/40004) to ask for feedback. (Also, there were some comments on my original PR that I took into consideration as well.) This PR is my attempt to take all the feedback into account and propose a better and simplified error message that should still be accurate. Its main benefit is having simpler grammar, and hopefully being easier to read and understand. Thanks to everyone who commented and gave feedback, and thank you for taking a look at this PR.

@RalfJung

…RalfJung Remove outdated reference to interpreter snapshotting This should have been a part of rust-lang#70087. r? @RalfJung

…, r=RalfJung Inline some function docs in `core::ptr` Resolves rust-lang#64539.

@Dylan-DPC

…an-DPC Improve E0567 explanation r? @Dylan-DPC

Dylan-DPC-zz · 2020-04-23T13:57:34Z

@bors r+ rollup=never p=6

bors · 2020-04-23T14:04:48Z

📌 Commit 47e2687 has been approved by Dylan-DPC

rust-highfive · 2020-04-23T14:17:15Z

Your PR failed (pretty log, 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.

2020-04-23T14:00:42.5709458Z ========================== Starting Command Output ===========================
2020-04-23T14:00:42.5711781Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/5e6e8ccf-450d-4e98-b473-f7210a98794b.sh
2020-04-23T14:00:42.5712040Z 
2020-04-23T14:00:42.5715780Z ##[section]Finishing: Disable git automatic line ending conversion
2020-04-23T14:00:42.5734871Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71467/merge to s
2020-04-23T14:00:42.5738123Z Task         : Get sources
2020-04-23T14:00:42.5738404Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-04-23T14:00:42.5738694Z Version      : 1.0.0
2020-04-23T14:00:42.5738885Z Author       : Microsoft
---
2020-04-23T14:00:43.8094792Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-04-23T14:00:43.8108786Z ##[command]git config gc.auto 0
2020-04-23T14:00:43.8122691Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-04-23T14:00:43.8128922Z ##[command]git config --get-all http.proxy
2020-04-23T14:00:44.8078142Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/71467/merge:refs/remotes/pull/71467/merge
---
2020-04-23T14:04:31.8343929Z  ---> 318032b5f0e2
2020-04-23T14:04:31.8345275Z Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
2020-04-23T14:04:31.8355158Z  ---> Using cache
2020-04-23T14:04:31.8355798Z  ---> d44a858fd1ce
2020-04-23T14:04:31.8357494Z Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
2020-04-23T14:04:31.8363886Z  ---> 58b910f50f5a
2020-04-23T14:04:31.8364096Z Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
2020-04-23T14:04:31.8370799Z  ---> Using cache
2020-04-23T14:04:31.8371171Z  ---> ee7702aadba1
---
2020-04-23T14:04:31.8749175Z Looks like docker image is the same as before, not uploading
2020-04-23T14:04:39.3084517Z [CI_JOB_NAME=x86_64-gnu-llvm-8]
2020-04-23T14:04:39.3427596Z [CI_JOB_NAME=x86_64-gnu-llvm-8]
2020-04-23T14:04:39.3463757Z == clock drift check ==
2020-04-23T14:04:39.3475290Z   local time: Thu Apr 23 14:04:39 UTC 2020
2020-04-23T14:04:39.6168518Z   network time: Thu, 23 Apr 2020 14:04:39 GMT
2020-04-23T14:04:39.6195101Z Starting sccache server...
2020-04-23T14:04:39.7048789Z configure: processing command line
2020-04-23T14:04:39.7049075Z configure: 
2020-04-23T14:04:39.7049927Z configure: rust.dist-src        := False

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 @rust-lang/infra. (Feature Requests)

bors · 2020-04-23T14:40:27Z

⌛ Testing commit 47e2687 with merge 413a129...

bors · 2020-04-23T17:39:31Z

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

rust-highfive · 2020-04-23T17:40:50Z

📣 Toolstate changed by #71467!

Tested on commit 413a129.
Direct link to PR: #71467

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@413a129. Direct link to PR: <rust-lang/rust#71467> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

jonas-schievink and others added 27 commits April 20, 2020 21:18

Treat RETURN_PLACE as a normal Local

4eaf535

Copy its value to the `return_place` upon leaving a call frame

Remove null places

a417f96

Fix pop_stack_frame logic

34ed891

Dump return_place upon returning

0fda0fd

Update const prop

c5bfbb6

Fix codegen and mir-opt tests

a5c1851

Mostly renamed allocations, but I'm not sure about the const prop tests

Remove unnecessary block

f0ab469

Bless 32-bit test output

1ce6e6a

Use copy_op_transmute

9e6f38a

const prop: don't special case return place

415fd0c

Improve E0308 error message wording again

57c2712

Remove outdated reference to interpreter snapshotting

e97c227

Inline some function docs re-exported in std::ptr

b3c26de

Fix ui test blessing when a test has an empty stderr file after havin…

a135ced

…g had content there before the current changes

Rename Item to ConstCx.

6a3fb26

This renaming was already done in some modules via import renaming. It's strictly used as a context, and it contains a `TyCtxt`.

Use ConstCx in more places

f0f7a59

Use ConstCx in the promoted collector

0bc743e

Improve E0567 explanation

cffd4b6

Use ConstCx for validate_candidates

22a5379

Catch and fix explicit promotions that fail to actually promote

119c636

Document our sanity assertion around explicit promotion

4cdc31b

Rollup merge of rust-lang#71198 - oli-obk:const_check_cleanup, r=Ralf…

629a613

…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

Rollup merge of rust-lang#71452 - ecstatic-morse:no-more-snapshot, r=…

414355b

…RalfJung Remove outdated reference to interpreter snapshotting This should have been a part of rust-lang#70087. r? @RalfJung

Rollup merge of rust-lang#71454 - ecstatic-morse:inline-core-ptr-docs…

98cadb2

…, r=RalfJung Inline some function docs in `core::ptr` Resolves rust-lang#64539.

Rollup merge of rust-lang#71461 - GuillaumeGomez:improve-e0567, r=Dyl…

47e2687

…an-DPC Improve E0567 explanation r? @Dylan-DPC

Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 23, 2020

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 23, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2020

bors merged commit 413a129 into rust-lang:master Apr 23, 2020

bors mentioned this pull request Apr 23, 2020

Simplify local_def_id and as_local_hir_id #71215

Merged

rust-highfive mentioned this pull request Apr 23, 2020

miri no longer builds after rust-lang/rust#71467 #71474

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#71467

Rollup of 6 pull requests#71467
bors merged 27 commits intorust-lang:masterfrom
Dylan-DPC-zz:rollup-d1os8ug

Dylan-DPC-zz commented Apr 23, 2020

Uh oh!

Dylan-DPC-zz commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

rust-highfive commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

rust-highfive commented Apr 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

Dylan-DPC-zz commented Apr 23, 2020

Uh oh!

Dylan-DPC-zz commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

rust-highfive commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

bors commented Apr 23, 2020

Uh oh!

rust-highfive commented Apr 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants