Fix the miri tool #49933

oli-obk · 2018-04-13T14:09:22Z

r? @eddyb

cc @bjorn3

fixes #49777

rust-highfive · 2018-04-13T14:09:26Z

Warning

These commits modify submodules.

eddyb · 2018-04-13T14:16:56Z

src/librustc_mir/interpret/eval_context.rs

+        let discr_val = self.read_discriminant_value(place, ty)?;
+        let layout = self.layout_of(ty)?;
+        match layout.variants {
+            ty::layout::Variants::Single { index } => Ok(index),


Can this early-return index, without going through read_discriminant_value?

eddyb · 2018-04-13T14:18:03Z

src/librustc_mir/interpret/eval_context.rs

@@ -837,13 +817,39 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M
        }
    }

+    /// obtains the discriminant from `ByVal` or `ByValPair` and forwards to
+    /// read_discriminant_value for `ByRef`
+    pub fn read_discriminant_value_as_variant_index(


I'm not sure the comment is correct. Also, read_discriminant_as_variant_index seems slightly better as a name?

eddyb · 2018-04-13T14:18:51Z

src/librustc_mir/interpret/eval_context.rs

+            layout::Variants::Tagged { .. } => {
+                if discr.ty.is_signed() {
+                    let i = raw_discr.to_bytes()? as i128;
+                    // going from layout discriminant type to typeck discriminant type


Please call the layout/codegen/memory counterpart "tag" not "discriminant".

eddyb · 2018-04-13T14:20:50Z

src/librustc_mir/interpret/eval_context.rs

+                    let discr_ty = layout::Integer::from_attr(self.tcx.tcx, discr_ty);
+                    let amt = 128 - discr_ty.size().bits();
+                    let truncatee = sexted as u128;
+                    (truncatee << amt) >> amt


Are there no helpers in miri to do "integer casts" (zext/sext/trunc) without repeating these bitops all over the place?

nope ^^ I'll take my own advice and open an easy issue

eddyb · 2018-04-13T14:21:44Z

src/librustc_mir/interpret/eval_context.rs

                let discr_val = dest_ty.ty_adt_def().unwrap()
                    .discriminant_for_variant(*self.tcx, variant_index)
                    .val;

+                // raw discriminants for enums are isize or bigger during
+                // their computation, but later shrunk to the smallest possible
+                // representation


This should also use "discriminant" vs "tag" terminology. Also, I wish the discr field in Variants::Tagged was called tag.

rust-highfive · 2018-04-13T14:34:49Z

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.

Resolving deltas: 100% (614347/614347), completed with 4877 local objects.
---
[00:00:11] error: Server does not allow request for unadvertised object 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e
[00:00:11] Fetched in submodule path 'src/tools/miri', but it did not contain 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e. Direct fetching of that commit failed.
---
[00:00:13] error: Server does not allow request for unadvertised object 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e
[00:00:13] Fetched in submodule path 'src/tools/miri', but it did not contain 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e. Direct fetching of that commit failed.
---
[00:00:15] error: Server does not allow request for unadvertised object 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e
[00:00:15] Fetched in submodule path 'src/tools/miri', but it did not contain 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e. Direct fetching of that commit failed.
---
[00:00:17] error: Server does not allow request for unadvertised object 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e
[00:00:17] Fetched in submodule path 'src/tools/miri', but it did not contain 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e. Direct fetching of that commit failed.
---
[00:00:18] error: Server does not allow request for unadvertised object 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e
[00:00:18] Fetched in submodule path 'src/tools/miri', but it did not contain 3f1b2bdd6895f9aedb22601bd28bc690d5a55a1e. Direct fetching of that commit failed.
[00:00:18] The command has failed after 5 attempts.
---
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access /home/travis/Library/Logs/DiagnosticReports/: No such file or directory
travis_time:end:35898fee:start=1523630087062695198,finish=1523630087069131913,duration=6436715
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:3b914e40
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:3b914e40:start=1523630087075375511,finish=1523630087081524122,duration=6148611
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0ad3767c
$ dmesg | grep -i kill
[   11.828926] init: failsafe main process (1096) kille

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-04-14T13:08:04Z

I created a long lived branch in the miri repo which we're going to merge, not rebase or force-push in any other way.

bors · 2018-04-19T11:13:36Z

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

bors · 2018-04-21T03:07:25Z

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

eddyb · 2018-04-24T17:39:25Z

@bors r+

bors · 2018-04-24T17:39:25Z

📌 Commit 3084c06 has been approved by eddyb

bors · 2018-04-24T18:04:58Z

⌛ Testing commit 3084c06 with merge f5203d1...

@eddyb

Fix the miri tool r? @eddyb cc @bjorn3 fixes #49777

bors · 2018-04-24T20:59:10Z

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

kennytm-githubbot · 2018-04-24T21:00:32Z

📣 Toolstate changed by #49933!

Tested on commit f5203d1.
Direct link to PR: #49933

🎉 miri on windows: build-fail → test-fail.
🎉 miri on linux: build-fail → test-fail.

Tested on commit rust-lang/rust@f5203d1. Direct link to PR: <rust-lang/rust#49933> 🎉 miri on windows: build-fail → test-fail. 🎉 miri on linux: build-fail → test-fail.

rust-highfive assigned eddyb Apr 13, 2018

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

oli-obk mentioned this pull request Apr 13, 2018

Rustup rust-lang/miri#364

Closed

eddyb reviewed Apr 13, 2018

View reviewed changes

oli-obk mentioned this pull request Apr 13, 2018

Print message that clarifies some components are allowed to fail during build. #49952

Closed

oli-obk force-pushed the miri_rustup branch from d571a2a to 283fa7d Compare April 17, 2018 12:27

oli-obk force-pushed the miri_rustup branch from 283fa7d to e70e228 Compare April 19, 2018 11:24

Fix the miri tool

3084c06

oli-obk force-pushed the miri_rustup branch from e70e228 to 3084c06 Compare April 23, 2018 09:38

oli-obk mentioned this pull request Apr 24, 2018

Remove Allocation.runtime_mutability #50193

Closed

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 Apr 24, 2018

bors added a commit that referenced this pull request Apr 24, 2018

Auto merge of #49933 - oli-obk:miri_rustup, r=eddyb

f5203d1

Fix the miri tool r? @eddyb cc @bjorn3 fixes #49777

bors merged commit 3084c06 into rust-lang:master Apr 24, 2018

bors mentioned this pull request Apr 24, 2018

Treat repr(Rust) univariant fieldless enums as ZSTs #49513

Merged

oli-obk deleted the miri_rustup branch June 15, 2020 15:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the miri tool #49933

Fix the miri tool #49933

oli-obk commented Apr 13, 2018

rust-highfive commented Apr 13, 2018

eddyb Apr 13, 2018

eddyb Apr 13, 2018

eddyb Apr 13, 2018

eddyb Apr 13, 2018

oli-obk Apr 13, 2018

eddyb Apr 13, 2018

rust-highfive commented Apr 13, 2018

oli-obk commented Apr 14, 2018

bors commented Apr 19, 2018

bors commented Apr 21, 2018

eddyb commented Apr 24, 2018

bors commented Apr 24, 2018

bors commented Apr 24, 2018

bors commented Apr 24, 2018

kennytm-githubbot commented Apr 24, 2018

Fix the miri tool #49933

Fix the miri tool #49933

Conversation

oli-obk commented Apr 13, 2018

rust-highfive commented Apr 13, 2018

eddyb Apr 13, 2018

Choose a reason for hiding this comment

eddyb Apr 13, 2018

Choose a reason for hiding this comment

eddyb Apr 13, 2018

Choose a reason for hiding this comment

eddyb Apr 13, 2018

Choose a reason for hiding this comment

oli-obk Apr 13, 2018

Choose a reason for hiding this comment

eddyb Apr 13, 2018

Choose a reason for hiding this comment

rust-highfive commented Apr 13, 2018

oli-obk commented Apr 14, 2018

bors commented Apr 19, 2018

bors commented Apr 21, 2018

eddyb commented Apr 24, 2018

bors commented Apr 24, 2018

bors commented Apr 24, 2018

bors commented Apr 24, 2018

kennytm-githubbot commented Apr 24, 2018