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

Add Retagging statements #55316

Merged
merged 9 commits into from Nov 2, 2018

Conversation

Projects
None yet
5 participants
@RalfJung
Member

RalfJung commented Oct 24, 2018

This adds a Retag statement kind to MIR, used to perform the retagging operation from Stacked Borrows. It also kills the old Validate statements that I added last year.

NOTE: This includes #55270. Only these commits are new.

@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Oct 24, 2018

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 24, 2018

@rust-highfive rust-highfive assigned oli-obk and unassigned pnkfelix Oct 24, 2018

@rust-highfive

This comment was marked as resolved.

Collaborator

rust-highfive commented Oct 24, 2018

The job x86_64-gnu-llvm-5.0 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.
travis_time:end:0bfb4d9c:start=1540393969356753597,finish=1540394031203593400,duration=61846839803
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
---

[00:04:09] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:09] tidy error: /checkout/src/librustc/mir/visit.rs:392: line longer than 100 chars
[00:04:10] some tidy checks failed
[00:04:10] 
[00:04:10] 
[00:04:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:10] 
[00:04:10] 
[00:04:10] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:10] Build completed unsuccessfully in 0:00:45
[00:04:10] Build completed unsuccessfully in 0:00:45
[00:04:10] make: *** [tidy] Error 1
[00:04:10] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:15ccc3f0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0574b61b:start=1540394291782286847,finish=1540394291786876738,duration=4589891
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:3ba9d6d1
$ 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:123ac966
travis_time:start:123ac966
$ 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:18fcd54e
$ 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)

Show resolved Hide resolved src/bootstrap/bin/rustc.rs
Show resolved Hide resolved src/librustc/mir/mod.rs Outdated
Show resolved Hide resolved src/librustc_mir/transform/add_retag.rs Outdated
Show resolved Hide resolved src/librustc_mir/transform/add_retag.rs
Show resolved Hide resolved src/librustc_mir/transform/add_retag.rs
Show resolved Hide resolved src/librustc_mir/transform/add_retag.rs Outdated
Show resolved Hide resolved src/librustc_mir/transform/add_retag.rs
Show resolved Hide resolved src/librustc_mir/transform/inline.rs
@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 25, 2018

Fixed all your comments.

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Oct 25, 2018

r=me once the other PR is merged

@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

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

@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 26, 2018

@oli-obk I pushed a small API change to make create_ref easier to use outside of step.rs.

As for the conflicts, I will have to rebase the PR this is based on first.

@bors

This comment has been minimized.

Contributor

bors commented Oct 26, 2018

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

@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 29, 2018

@oli-obk Rebased. The last commit (3545dae) has been added after your r=me so I am going to wait for an r+ from you.

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 29, 2018

📌 Commit 3545dae has been approved by oli-obk

@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 29, 2018

I added 2a5eae3, another small API change I'd like to sneak into this if I may.

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 29, 2018

📌 Commit 2a5eae3 has been approved by oli-obk

@RalfJung

This comment has been minimized.

Member

RalfJung commented Oct 29, 2018

Forgot about changing the third memory-access hook method. Sorry for the noise :(

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 29, 2018

📌 Commit d10304e has been approved by oli-obk

@bors

This comment has been minimized.

Contributor

bors commented Nov 2, 2018

⌛️ Testing commit d10304e with merge 87a3c1e...

bors added a commit that referenced this pull request Nov 2, 2018

Auto merge of #55316 - RalfJung:retagging, r=oli-obk
Add Retagging statements

This adds a `Retag` statement kind to MIR, used to perform the retagging operation from [Stacked Borrows](https://www.ralfj.de/blog/2018/08/07/stacked-borrows.html). It also kills the old `Validate` statements that I added last year.

NOTE: This includes #55270. Only [these commits are new](RalfJung/rust@stacked-borrows-ng...RalfJung:retagging).
@bors

This comment has been minimized.

Contributor

bors commented Nov 2, 2018

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

@bors bors merged commit d10304e into rust-lang:master Nov 2, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

bors added a commit that referenced this pull request Nov 2, 2018

Auto merge of #55549 - RalfJung:miri-visitor, r=<try>
Value visitors for miri

Generalize the traversal part of validation to a `ValueVisitor`.

~~This includes #55316, [click here](RalfJung/rust@retagging...RalfJung:miri-visitor) for just the new commits.~~

This PR does not change the interface to miri, so I use the opportunity to update miri.

bors added a commit that referenced this pull request Nov 6, 2018

Auto merge of #55549 - RalfJung:miri-visitor, r=<try>
Value visitors for miri

Generalize the traversal part of validation to a `ValueVisitor`.

~~This includes #55316, [click here](RalfJung/rust@retagging...RalfJung:miri-visitor) for just the new commits.~~

This PR does not change the interface to miri, so I use the opportunity to update miri.

bors added a commit that referenced this pull request Nov 7, 2018

Auto merge of #55549 - RalfJung:miri-visitor, r=oli-obk
Value visitors for miri

Generalize the traversal part of validation to a `ValueVisitor`.

~~This includes #55316, [click here](RalfJung/rust@retagging...RalfJung:miri-visitor) for just the new commits.~~

@RalfJung RalfJung deleted the RalfJung:retagging branch Nov 9, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment