Don't mark borrows of zero-sized arrays as indirectly mutable #64967

ecstatic-morse · 2019-10-01T19:08:14Z

Resolves #64945

This is needed to dump graphviz results for the `IndirectlyMutableLocals` analysis.

ecstatic-morse · 2019-10-01T19:17:56Z

We should try to merge some form of this quickly, since #64945 seems like something that will be encountered by many nightly users. However, this may not be the best solution long-term.

As a result of this PR, a mutable borrow of a zero-sized array (&mut []) will no longer be marked as indirectly mutable. This is fine for const checking since it will get HasMutInterior regardless.

oli-obk · 2019-10-01T20:03:31Z

Please also add a regression test (for the &&[Cell::new(42); 0] case, too)

ecstatic-morse · 2019-10-01T20:39:38Z

Okay, I added some tests that are equivalent to #64945 but also test the code with a double reference, in a static and outside a generic context. All four of the variants ICE on the current nightly (you can copy each into the playground to verify this). The double reference fix works because &[_] is never Drop, so we may not need to do a more expensive analysis after all.

oli-obk · 2019-10-01T20:40:20Z

@bors r+

bors · 2019-10-01T20:40:21Z

📌 Commit 7a65fe3 has been approved by oli-obk

@oli-obk

Don't mark borrows of zero-sized arrays as indirectly mutable Resolves rust-lang#64945 r? @oli-obk

rust-highfive · 2019-10-01T21:49:36Z

The job x86_64-gnu-llvm-6.0 of 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.

2019-10-01T20:36:19.1565620Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-01T20:36:19.1750980Z ##[command]git config gc.auto 0
2019-10-01T20:36:19.1818592Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-01T20:36:19.1871009Z ##[command]git config --get-all http.proxy
2019-10-01T20:36:19.1998233Z ##[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/64967/merge:refs/remotes/pull/64967/merge
---
2019-10-01T21:38:46.5963322Z .................................................................................................... 1400/9086
2019-10-01T21:38:52.9925146Z .........................F.......................................................................... 1500/9086
2019-10-01T21:38:59.5035649Z .................................................................................................... 1600/9086
2019-10-01T21:39:08.9785829Z .................................................................................................... 1700/9086
2019-10-01T21:39:17.2537975Z i...............i................................................................................... 1800/9086
2019-10-01T21:39:24.1063811Z ...........................................................................................iiiii.... 1900/9086
2019-10-01T21:39:45.8669033Z .................................................................................................... 2100/9086
2019-10-01T21:39:48.1664984Z .................................................................................................... 2200/9086
2019-10-01T21:39:50.6434230Z .................................................................................................... 2300/9086
2019-10-01T21:39:57.3883456Z .................................................................................................... 2400/9086
---
2019-10-01T21:42:50.0062842Z ..............................................................................i...............i..... 4700/9086
2019-10-01T21:42:57.7944914Z .................................................................................................... 4800/9086
2019-10-01T21:43:07.6661933Z .................................................................................................... 4900/9086
2019-10-01T21:43:13.5835070Z .................................................................................................... 5000/9086
2019-10-01T21:43:24.6226590Z .....................................................................ii.ii.......................... 5100/9086
2019-10-01T21:43:34.1594384Z .................................................................................................... 5300/9086
2019-10-01T21:43:43.2619144Z .................................................................................................... 5400/9086
2019-10-01T21:43:50.6159434Z ...................................i................................................................ 5500/9086
2019-10-01T21:43:56.9390048Z .................................................................................................... 5600/9086
2019-10-01T21:43:56.9390048Z .................................................................................................... 5600/9086
2019-10-01T21:44:08.6663577Z .................................................................................................... 5700/9086
2019-10-01T21:44:19.1699340Z ...............................ii...i..ii...........i............................................... 5800/9086
2019-10-01T21:44:40.5226278Z .................................................................................................... 6000/9086
2019-10-01T21:44:47.9821156Z .................................................................................................... 6100/9086
2019-10-01T21:44:47.9821156Z .................................................................................................... 6100/9086
2019-10-01T21:45:01.6454158Z ..................................i..ii............................................................. 6200/9086
2019-10-01T21:45:21.1659126Z ..............................................................................................i..... 6400/9086
2019-10-01T21:45:23.2880865Z .................................................................................................... 6500/9086
2019-10-01T21:45:25.4763744Z ..................................................................i................................. 6600/9086
2019-10-01T21:45:28.3713566Z .................................................................................................... 6700/9086
---
2019-10-01T21:49:30.2018550Z normalized stderr:
2019-10-01T21:49:30.2018624Z error[E0597]: `x` does not live long enough
2019-10-01T21:49:30.2020051Z   --> $DIR/generic-slice.rs:15:9
2019-10-01T21:49:30.2020108Z    |
2019-10-01T21:49:30.2020960Z LL | impl<'a, T: 'static> Generic<'a, T> {
2019-10-01T21:49:30.2021263Z ...
2019-10-01T21:49:30.2021300Z LL |         &x
2019-10-01T21:49:30.2021354Z    |         ^^
2019-10-01T21:49:30.2021562Z    |         |
---
2019-10-01T21:49:30.2024651Z 
2019-10-01T21:49:30.2024682Z 
2019-10-01T21:49:30.2024726Z 
2019-10-01T21:49:30.2024773Z The actual stderr differed from the expected stderr.
2019-10-01T21:49:30.2025140Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-eval/generic-slice/generic-slice.stderr
2019-10-01T21:49:30.2025438Z To update references, rerun the tests and pass the `--bless` flag
2019-10-01T21:49:30.2026441Z To only update this specific test, also pass `--test-args consts/const-eval/generic-slice.rs`
2019-10-01T21:49:30.2026554Z error: 1 errors occurred comparing output.
2019-10-01T21:49:30.2026600Z status: exit code: 1
2019-10-01T21:49:30.2026600Z status: exit code: 1
2019-10-01T21:49:30.2027392Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/const-eval/generic-slice.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-eval/generic-slice" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-eval/generic-slice/auxiliary" "-A" "unused"
2019-10-01T21:49:30.2027766Z ------------------------------------------
2019-10-01T21:49:30.2027822Z 
2019-10-01T21:49:30.2028063Z ------------------------------------------
2019-10-01T21:49:30.2028112Z stderr:
2019-10-01T21:49:30.2028112Z stderr:
2019-10-01T21:49:30.2028344Z ------------------------------------------
2019-10-01T21:49:30.2028413Z error[E0597]: `x` does not live long enough
2019-10-01T21:49:30.2028675Z   --> /checkout/src/test/ui/consts/const-eval/generic-slice.rs:15:9
2019-10-01T21:49:30.2028730Z    |
2019-10-01T21:49:30.2028991Z LL | impl<'a, T: 'static> Generic<'a, T> {
2019-10-01T21:49:30.2029433Z ...
2019-10-01T21:49:30.2029657Z LL |         &x
2019-10-01T21:49:30.2029704Z    |         ^^
2019-10-01T21:49:30.2029740Z    |         |
2019-10-01T21:49:30.2029740Z    |         |
2019-10-01T21:49:30.2029797Z    |         borrowed value does not live long enough
2019-10-01T21:49:30.2030053Z    |         using this value as a constant requires that `x` is borrowed for `'a`
2019-10-01T21:49:30.2030104Z LL |         //~^ ERROR `x` does not live long enough
2019-10-01T21:49:30.2030378Z    |     - `x` dropped here while still borrowed
2019-10-01T21:49:30.2030409Z 
2019-10-01T21:49:30.2030447Z error[E0597]: `x` does not live long enough
2019-10-01T21:49:30.2030698Z   --> /checkout/src/test/ui/consts/const-eval/generic-slice.rs:27:5
2019-10-01T21:49:30.2030698Z   --> /checkout/src/test/ui/consts/const-eval/generic-slice.rs:27:5
2019-10-01T21:49:30.2030903Z    |
2019-10-01T21:49:30.2030939Z LL |     &x
2019-10-01T21:49:30.2030974Z    |     ^^
2019-10-01T21:49:30.2031026Z    |     |
2019-10-01T21:49:30.2031064Z    |     borrowed value does not live long enough
2019-10-01T21:49:30.2031315Z    |     using this value as a static requires that `x` is borrowed for `'static`
2019-10-01T21:49:30.2031385Z LL |     //~^ ERROR `x` does not live long enough
2019-10-01T21:49:30.2031629Z    | - `x` dropped here while still borrowed
2019-10-01T21:49:30.2031673Z 
2019-10-01T21:49:30.2031711Z error: aborting due to 2 previous errors
2019-10-01T21:49:30.2031736Z 
---
2019-10-01T21:49:30.2052335Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-10-01T21:49:30.2052485Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-01T21:49:30.2072268Z 
2019-10-01T21:49:30.2072377Z 
2019-10-01T21:49:30.2073927Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-10-01T21:49:30.2074521Z 
2019-10-01T21:49:30.2074550Z 
2019-10-01T21:49:30.2081277Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-10-01T21:49:30.2081365Z Build completed unsuccessfully in 1:05:51
2019-10-01T21:49:30.2081365Z Build completed unsuccessfully in 1:05:51
2019-10-01T21:49:30.2133497Z == clock drift check ==
2019-10-01T21:49:30.2148590Z   local time: Tue Oct  1 21:49:30 UTC 2019
2019-10-01T21:49:30.2394355Z   network time: Tue, 01 Oct 2019 21:49:30 GMT
2019-10-01T21:49:30.2398601Z == end clock drift check ==
2019-10-01T21:49:31.5068248Z ##[error]Bash exited with code '1'.
2019-10-01T21:49:31.5152539Z ##[section]Starting: Checkout
2019-10-01T21:49:31.5154550Z ==============================================================================
2019-10-01T21:49:31.5154623Z Task         : Get sources
2019-10-01T21:49:31.5154669Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

Centril · 2019-10-01T21:55:44Z

@bors r-

This also tests that `&&[]` no longer causes an ICE in this PR (although the test fails the borrow checker). This could be more complete.

ecstatic-morse · 2019-10-01T22:00:22Z

@Centril this now includes the .stderr file for the failing test. Sorry!

Centril · 2019-10-01T22:02:34Z

Thanks; let's wait for the PR builder to be happy also. :)

ecstatic-morse · 2019-10-01T22:04:44Z

But it works fine on my machine! 😆

oli-obk · 2019-10-02T05:32:28Z

@bors r+

bors · 2019-10-02T05:32:30Z

📌 Commit 4eeedd0 has been approved by oli-obk

@oli-obk

Don't mark borrows of zero-sized arrays as indirectly mutable Resolves rust-lang#64945 r? @oli-obk

@ghost

Rollup of 13 pull requests Successful merges: - #64581 (Fix unreachable_code warnings for try{} block ok-wrapped expressions) - #64850 (Remove inlines from DepNode code) - #64914 (regression test for 64453 borrow check error.) - #64922 (Use PlaceBuilder to avoid a lot of slice -> vec -> slice convertions) - #64948 (Improve sidebar styling to make its integration easier) - #64961 (Make comment about dummy type a bit more clear) - #64967 (Don't mark borrows of zero-sized arrays as indirectly mutable) - #64973 (Fix typo while setting `compile-flags` in test) - #64980 (Enable support for `IndirectlyMutableLocals` in `rustc_peek` ) - #64989 (Fix ICE #64964) - #64991 ([const-prop] Correctly handle locals that can't be propagated) - #64995 (Remove rustdoc warning) - #64997 (rustc book: nitpick SLP vectorization) Failed merges: r? @ghost

ecstatic-morse added 2 commits October 1, 2019 11:35

Pass attrs to do_dataflow in new const checker

a1ad38f

This is needed to dump graphviz results for the `IndirectlyMutableLocals` analysis.

Don't mark zero-sized arrays as indirectly mutable when borrowed

8d84646

rust-highfive assigned oli-obk Oct 1, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 1, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 1, 2019

Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019

Rollup merge of rust-lang#64967 - ecstatic-morse:issue-64945, r=oli-obk

74586e2

Don't mark borrows of zero-sized arrays as indirectly mutable Resolves rust-lang#64945 r? @oli-obk

Centril mentioned this pull request Oct 1, 2019

Rollup of 8 pull requests #64971

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 1, 2019

Add test cases for rust-lang#64945

4eeedd0

This also tests that `&&[]` no longer causes an ICE in this PR (although the test fails the borrow checker). This could be more complete.

ecstatic-morse force-pushed the issue-64945 branch from 7a65fe3 to 4eeedd0 Compare October 1, 2019 21:59

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 2, 2019

Centril added a commit to Centril/rust that referenced this pull request Oct 2, 2019

Rollup merge of rust-lang#64967 - ecstatic-morse:issue-64945, r=oli-obk

ccf1d9c

Don't mark borrows of zero-sized arrays as indirectly mutable Resolves rust-lang#64945 r? @oli-obk

Centril mentioned this pull request Oct 2, 2019

Rollup of 13 pull requests #65009

Merged

bors merged commit 4eeedd0 into rust-lang:master Oct 2, 2019

ecstatic-morse deleted the issue-64945 branch October 2, 2019 22:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't mark borrows of zero-sized arrays as indirectly mutable #64967

Don't mark borrows of zero-sized arrays as indirectly mutable #64967

ecstatic-morse commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019 •

edited

Loading

oli-obk commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019 •

edited

Loading

oli-obk commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

Centril commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019

Centril commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019

oli-obk commented Oct 2, 2019

bors commented Oct 2, 2019

Don't mark borrows of zero-sized arrays as indirectly mutable #64967

Don't mark borrows of zero-sized arrays as indirectly mutable #64967

Conversation

ecstatic-morse commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019 • edited Loading

oli-obk commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019 • edited Loading

oli-obk commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

Centril commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019

Centril commented Oct 1, 2019

ecstatic-morse commented Oct 1, 2019

oli-obk commented Oct 2, 2019

bors commented Oct 2, 2019

ecstatic-morse commented Oct 1, 2019 •

edited

Loading

ecstatic-morse commented Oct 1, 2019 •

edited

Loading