Miri engine refactoring #55674

oli-obk · 2018-11-04T14:15:53Z

split out the "just moves stuff around" part of #55293

src/librustc/mir/interpret/allocation.rs

bors · 2018-11-04T18:05:45Z

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

RalfJung · 2018-11-05T09:51:20Z

r=me after rebase

rust-highfive · 2018-11-05T12:34:28Z

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:1b8cd4b5:start=1541420765623417153,finish=1541420766810025814,duration=1186608661
$ 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 IMAGE=x86_64-gnu-llvm-5.0
---
[00:07:50]    |                     ^^^^ doesn't have a size known at compile-time
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:21:24
[00:07:50]   --> librustc/mir/interpret/pointer.rs:21:24
[00:07:50]    |
[00:07:50] 21 |     fn truncate_to_ptr(self, val: u128) -> (u64, bool) {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:27:34
[00:07:50]   --> librustc/mir/interpret/pointer.rs:27:34
[00:07:50]    |
[00:07:50] 27 |     fn overflowing_signed_offset(self, val: u64, i: i128) -> (u64, bool) {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:39:27
[00:07:50]   --> librustc/mir/interpret/pointer.rs:39:27
[00:07:50]    |
[00:07:50] 39 |     fn overflowing_offset(self, val: u64, i: u64) -> (u64, bool) {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:45:28
[00:07:50]   --> librustc/mir/interpret/pointer.rs:45:28
[00:07:50]    |
[00:07:50] 45 |     fn signed_offset<'tcx>(self, val: u64, i: i64) -> EvalResult<'tcx, u64> {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:50:21
[00:07:50]   --> librustc/mir/interpret/pointer.rs:50:21
[00:07:50]    |
[00:07:50] 50 |     fn offset<'tcx>(self, val: u64, i: u64) -> EvalResult<'tcx, u64> {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:50] error[E0277]: the size for values of type `Self` cannot be known at compilation time
[00:07:50]   --> librustc/mir/interpret/pointer.rs:55:31
[00:07:50]   --> librustc/mir/interpret/pointer.rs:55:31
[00:07:50]    |
[00:07:50] 55 |     fn wrapping_signed_offset(self, val: u64, i: i64) -> u64 {
[00:07:50]    |
[00:07:50]    = help: the trait `std::marker::Sized` is not implemented for `Self`
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
[00:07:50]    = help: consider adding a `where Self: std::marker::Sized` bound
[00:07:50]    = help: unsized locals are gated as an unstable feature
[00:07:50] 
[00:07:58] error: aborting due to 7 previous errors
[00:07:58] 
---
[00:07:58] travis_fold:end:stage0-rustc

[00:07:58] travis_time:end:stage0-rustc:start=1541421079570814179,finish=1541421255667987263,duration=176097173084

[00:07:58] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1101:9
[00:07:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:07:58] Build completed unsuccessfully in 0:04:04
[00:07:58] Makefile:28: recipe for target 'all' failed
[00:07:58] Makefile:28: recipe for target 'all' failed
[00:07:58] make: *** [all] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:16a7108c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:274e2916:start=1541421256300368392,finish=1541421256303877578,duration=3509186
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03cc7800
$ 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:1abfcb19
travis_time:start:1abfcb19
$ 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:2bd90828
$ 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)

oli-obk · 2018-11-06T11:52:49Z

@bors r=RalfJung

bors · 2018-11-06T11:52:50Z

📌 Commit 7276b4fb10c4bd659914785e412880cac4dd4afd has been approved by RalfJung

bors · 2018-11-07T12:04:34Z

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

oli-obk · 2018-11-08T18:37:25Z

@bors r=RalfJung

bors · 2018-11-08T18:37:26Z

📌 Commit 428af73 has been approved by RalfJung

bors · 2018-11-11T14:24:47Z

⌛ Testing commit 428af73 with merge a88613c...

@RalfJung

Miri engine refactoring r? @RalfJung split out the "just moves stuff around" part of #55293

bors · 2018-11-11T17:05:31Z

☀️ Test successful - status-appveyor, status-travis
Approved by: RalfJung
Pushing a88613c to master...

rust-highfive assigned RalfJung Nov 4, 2018

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

RalfJung reviewed Nov 4, 2018

View reviewed changes

src/librustc/mir/interpret/allocation.rs Show resolved Hide resolved

oli-obk force-pushed the miri_engine_refactoring branch from 36dbde7 to 645cc01 Compare November 4, 2018 15:08

oli-obk force-pushed the miri_engine_refactoring branch from 645cc01 to 905cbe5 Compare November 5, 2018 12:24

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 Nov 6, 2018

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

RalfJung mentioned this pull request Nov 8, 2018

Update to allocation method PR rust-lang/miri#493

Closed

oli-obk mentioned this pull request Nov 8, 2018

Self managing allocations #55293

Closed

oli-obk added 10 commits November 8, 2018 14:52

Duplicate mod.rs for better diff tracking

c6404f5

Move Allocation into its own module

7db0483

Move ScalarMaybeUndef back to rustc

48f6941

Move the memory_accessed hook onto the Extra value

6def30b

Move UndefMask and Relocations into allocation.rs

2108b6b

Move ScalarMaybeUndef into value.rs

99ed98b

Move Pointer to its own module

00e524c

Fallout

769ee79

Give AllocationExtras access to their entire Allocation

5d58a03

Rebase fallout

428af73

oli-obk force-pushed the miri_engine_refactoring branch from 7276b4f to 428af73 Compare November 8, 2018 18:18

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 Nov 8, 2018

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

Auto merge of #55674 - oli-obk:miri_engine_refactoring, r=RalfJung

a88613c

Miri engine refactoring r? @RalfJung split out the "just moves stuff around" part of #55293

bors merged commit 428af73 into rust-lang:master Nov 11, 2018

This was referenced Nov 11, 2018

Add VariantIdx type and use instead of usize #55589

Merged

Make const_eval_raw query return just an AllocId #55720

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Miri engine refactoring #55674

Miri engine refactoring #55674

Uh oh!

oli-obk commented Nov 4, 2018

Uh oh!

Uh oh!

bors commented Nov 4, 2018

Uh oh!

RalfJung commented Nov 5, 2018

Uh oh!

rust-highfive commented Nov 5, 2018

Uh oh!

oli-obk commented Nov 6, 2018

Uh oh!

bors commented Nov 6, 2018

Uh oh!

bors commented Nov 7, 2018

Uh oh!

oli-obk commented Nov 8, 2018

Uh oh!

bors commented Nov 8, 2018

Uh oh!

bors commented Nov 11, 2018

Uh oh!

bors commented Nov 11, 2018

Uh oh!

Uh oh!

Miri engine refactoring #55674

Miri engine refactoring #55674

Uh oh!

Conversation

oli-obk commented Nov 4, 2018

Uh oh!

Uh oh!

bors commented Nov 4, 2018

Uh oh!

RalfJung commented Nov 5, 2018

Uh oh!

rust-highfive commented Nov 5, 2018

Uh oh!

oli-obk commented Nov 6, 2018

Uh oh!

bors commented Nov 6, 2018

Uh oh!

bors commented Nov 7, 2018

Uh oh!

oli-obk commented Nov 8, 2018

Uh oh!

bors commented Nov 8, 2018

Uh oh!

bors commented Nov 11, 2018

Uh oh!

bors commented Nov 11, 2018

Uh oh!

Uh oh!