miri engine: Hooks for basic stacked borrows #55125

RalfJung · 2018-10-16T17:10:08Z

r? @oli-obk

oli-obk · 2018-10-16T18:06:14Z

@bors r+

bors · 2018-10-16T18:06:16Z

📌 Commit 5b4c5de5f3c4a537d5dd8fc074e5619a47fd158c has been approved by oli-obk

RalfJung · 2018-10-17T09:29:19Z

@bors r=oli-obk

(I had pushed something here but force-pushed it away again.)

bors · 2018-10-17T09:29:20Z

📌 Commit 5b4c5de5f3c4a537d5dd8fc074e5619a47fd158c has been approved by oli-obk

RalfJung · 2018-10-17T13:16:42Z

@oli-obk I pushed some more commits, matching the stacked-borrows miri branch where the test suite all passes. :)

oli-obk · 2018-10-17T13:37:08Z

src/librustc_mir/interpret/cast.rs

@@ -47,7 +46,19 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>

            Misc => {
                let src = self.read_value(src)?;
-                if self.type_is_fat_ptr(src_layout.ty) {
+
+                if src.layout.ty.is_region_ptr() && dest.layout.ty.is_unsafe_ptr() {


slightly unhappy about code that isn't needed during const eval but still will be compiled into const eval. Not sure what to do about that though

I cannot make it depend on enforce_validity() as that whitelists some functions in miri and I think my model might go crazy if references are only sometimes tracked.

I could add another const REF_TRACKING_HOOKS: bool though.

Good idea, not a blocker for this PR though

I'll forget it if I don't do it now, and this PR is still quite far up the queue anyway.^^

I might have to include a miri module update as well as we are nearing the week where we cannot break tools.

oli-obk · 2018-10-17T15:13:06Z

@bors r+

bors · 2018-10-17T15:13:07Z

📌 Commit eb5c69b33c30bca5ebb954caae337c33748368eb has been approved by oli-obk

oli-obk · 2018-10-17T15:47:01Z

@bors r+

bors · 2018-10-17T15:47:02Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: NLL: change compare-mode=nll to use borrowck=migrate #55134

bors · 2018-10-17T15:47:03Z

📌 Commit eb5c69b33c30bca5ebb954caae337c33748368eb has been approved by oli-obk

RalfJung · 2018-10-17T15:55:58Z

Fixed your nit, and included rust-lang/miri#487 so that the miri submodule keeps working.

oli-obk · 2018-10-17T16:06:26Z

@bors r+

bors · 2018-10-17T16:06:27Z

📌 Commit 4e784583aab5ec6ff083e47cb0c3d7fa3518d330 has been approved by oli-obk

bors · 2018-10-18T09:59:28Z

☔ The latest upstream changes (presumably #55171) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2018-10-18T11:11:40Z

📌 Commit 50d5cde2dd6b1ae80c170ff873453699d061278b has been approved by oli-obk

bors · 2018-10-20T17:37:30Z

⌛ Testing commit 50d5cde2dd6b1ae80c170ff873453699d061278b with merge c90f034f45dff5d7d4865259634139ca1cc03bf1...

RalfJung · 2018-10-20T23:34:02Z

Fixed by disabling a new miri test on Windows and macOS, where I cannot test them.

This can be much easier debugged on the miri side once things landed in rustc.

@bors r=oli-obk

bors · 2018-10-20T23:34:03Z

📌 Commit 3f5b550 has been approved by oli-obk

bors · 2018-10-21T04:59:56Z

⌛ Testing commit 3f5b550 with merge 3779b93f1bdcfa9c7ded680a7b2d715a24c688da...

bors · 2018-10-21T06:48:07Z

💔 Test failed - status-travis

rust-highfive · 2018-10-21T06:48:08Z

The job x86_64-gnu-aux 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:42:38] [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "cargotest", path: "src/tools/cargotest", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 1.158
[01:42:39] testing https://github.com/servo/webrender
[01:42:39] Initialized empty Git repository in /checkout/obj/build/ct/webrender/.git/
[01:42:39] fatal: Could not parse object '57250b2b8fa63934f80e5376a29f7dcb3f759ad6'.
[01:42:59] fatal: unable to access 'https://github.com/servo/webrender/': Could not resolve host: github.com
[01:42:59] thread 'main' panicked at 'assertion failed: status.success()', tools/cargotest/main.rs:128:13
[01:42:59] 
[01:42:59] 
[01:42:59] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargotest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/ct"
[01:42:59] expected success, got: exit code: 101
[01:42:59] expected success, got: exit code: 101
[01:42:59] 
[01:42:59] 
[01:42:59] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/test/run-fail-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:42:59] Build completed unsuccessfully in 0:42:57
[01:42:59] make: *** [check-aux] Error 1
[01:42:59] Makefile:60: recipe for target 'check-aux' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:002c04c2
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:08ffb750:start=1540104389904852277,finish=1540104389914872150,duration=10019873
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0096690f
$ 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:1be205b0
travis_time:start:1be205b0
$ 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:18508c29
$ 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)

kennytm · 2018-10-21T06:57:54Z

@bors retry travis-ci/travis-ci#9696

bors · 2018-10-21T09:32:33Z

⌛ Testing commit 3f5b550 with merge 66910ba...

@oli-obk

miri engine: Hooks for basic stacked borrows r? @oli-obk

bors · 2018-10-21T12:04:19Z

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 66910ba to master...

rust-highfive assigned oli-obk Oct 16, 2018

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

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 16, 2018

RalfJung force-pushed the stacked-borrows branch from 21f80da to 5b4c5de Compare October 17, 2018 09:28

This comment has been minimized.

Sign in to view

oli-obk reviewed Oct 17, 2018

View reviewed changes

RalfJung mentioned this pull request Oct 17, 2018

Rustup: Stacked Borrows rust-lang/miri#487

Merged

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 18, 2018

RalfJung force-pushed the stacked-borrows branch from 4e78458 to 9282fd3 Compare October 18, 2018 10:05

RalfJung added 5 commits October 18, 2018 12:08

comment on keeping validity in sync

290db47

add support for storing extra data in an allocation

21934c8

give machine more control over what counts as memory leak

5b71857

provide machine hooks for creating references and accessing memory

ce9cd15

eval_context: move getters together and add one for is_freeze

5f20b16

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 18, 2018

This comment has been minimized.

Sign in to view

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 Oct 20, 2018

update miri

3f5b550

RalfJung force-pushed the stacked-borrows branch from 50d5cde to 3f5b550 Compare October 20, 2018 23:32

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 20, 2018

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 Oct 21, 2018

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 21, 2018

bors added a commit that referenced this pull request Oct 21, 2018

Auto merge of #55125 - RalfJung:stacked-borrows, r=oli-obk

66910ba

miri engine: Hooks for basic stacked borrows r? @oli-obk

bors merged commit 3f5b550 into rust-lang:master Oct 21, 2018

bors mentioned this pull request Oct 21, 2018

Give OpTy access to locals for priroda #55179

Merged

RalfJung mentioned this pull request Oct 22, 2018

Rustup rust-lang/miri#490

Closed

RalfJung deleted the stacked-borrows branch November 9, 2018 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

miri engine: Hooks for basic stacked borrows #55125

miri engine: Hooks for basic stacked borrows #55125

RalfJung commented Oct 16, 2018

oli-obk commented Oct 16, 2018

bors commented Oct 16, 2018

RalfJung commented Oct 17, 2018

bors commented Oct 17, 2018

RalfJung commented Oct 17, 2018

This comment has been minimized.

oli-obk Oct 17, 2018

RalfJung Oct 17, 2018

oli-obk Oct 17, 2018

RalfJung Oct 17, 2018 •

edited

Loading

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

RalfJung commented Oct 17, 2018

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 18, 2018

bors commented Oct 18, 2018

bors commented Oct 20, 2018

This comment has been minimized.

RalfJung commented Oct 20, 2018

bors commented Oct 20, 2018

bors commented Oct 21, 2018

bors commented Oct 21, 2018

rust-highfive commented Oct 21, 2018

kennytm commented Oct 21, 2018

bors commented Oct 21, 2018

bors commented Oct 21, 2018

miri engine: Hooks for basic stacked borrows #55125

miri engine: Hooks for basic stacked borrows #55125

Conversation

RalfJung commented Oct 16, 2018

oli-obk commented Oct 16, 2018

bors commented Oct 16, 2018

RalfJung commented Oct 17, 2018

bors commented Oct 17, 2018

RalfJung commented Oct 17, 2018

This comment has been minimized.

oli-obk Oct 17, 2018

Choose a reason for hiding this comment

RalfJung Oct 17, 2018

Choose a reason for hiding this comment

oli-obk Oct 17, 2018

Choose a reason for hiding this comment

RalfJung Oct 17, 2018 • edited Loading

Choose a reason for hiding this comment

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 17, 2018

RalfJung commented Oct 17, 2018

oli-obk commented Oct 17, 2018

bors commented Oct 17, 2018

bors commented Oct 18, 2018

bors commented Oct 18, 2018

bors commented Oct 20, 2018

This comment has been minimized.

RalfJung commented Oct 20, 2018

bors commented Oct 20, 2018

bors commented Oct 21, 2018

bors commented Oct 21, 2018

rust-highfive commented Oct 21, 2018

kennytm commented Oct 21, 2018

bors commented Oct 21, 2018

bors commented Oct 21, 2018

RalfJung Oct 17, 2018 •

edited

Loading