miri engine: Fix run-time validation #54955

RalfJung · 2018-10-10T07:13:03Z

This fixes all false positives that came up when actually enabling this in miri.

RalfJung · 2018-10-10T17:23:20Z

Rebase done.

oli-obk · 2018-10-10T19:16:41Z

src/librustc_mir/interpret/validity.rs

                }
+                // The closure is not local, or the freevars don't match up (seen for a generator!),


tcx.mir_optimized(def_id).upvar_decls[upvar_index].debug_name should do it?

There is no such method?

sorry, was on mobile

https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyCtxt.html#method.optimized_mir

What will that do if we don't have libstd MIR?

uhm... I don't see how that can happen. How would you even see a libstd closure without its MIR being available?

Fair enough.

However, for a generator, I am still seeing

index out of bounds: the len is 0 but the index is 0

So I'll have to keep some kind of fallback.

Done, and even added a test for it. ;)

oli-obk · 2018-10-11T08:26:02Z

r=me with Cargo.lock updated

RalfJung · 2018-10-11T08:31:59Z

@bors r=oli-obk

bors · 2018-10-11T08:32:00Z

📌 Commit c54155e00820ebba98f5a2bba7cfe07042576056 has been approved by oli-obk

src/librustc_mir/interpret/validity.rs

src/librustc_mir/interpret/memory.rs

RalfJung · 2018-10-11T11:13:51Z

Fixed nits.

oli-obk · 2018-10-11T11:17:56Z

@bors r+

bors · 2018-10-11T11:17:57Z

📌 Commit e4154998576017fcc966b20cf17689aaf6d12ba2 has been approved by oli-obk

RalfJung · 2018-10-11T13:00:06Z

Oh dang, miri's test suite fails with full MIR. Investigating.

RalfJung · 2018-10-11T14:11:43Z

This should fix it.

@bors r=oli-obk

bors · 2018-10-11T14:11:44Z

📌 Commit 752034d2e98c66d4cf6243d8f895915a1883f5d5 has been approved by oli-obk

oli-obk · 2018-10-12T09:00:24Z

@bors r+

bors · 2018-10-12T09:00:25Z

📌 Commit a7a53f7ffffe596101f93af35f9172641daca1cd has been approved by oli-obk

miri needs this extra flexibility

RalfJung · 2018-10-13T07:11:21Z

Fixed conflicts.

@bors r=oli-obk

bors · 2018-10-13T07:11:22Z

📌 Commit 6426cbe has been approved by oli-obk

bors · 2018-10-13T09:20:55Z

⌛ Testing commit 6426cbe with merge 2d81989...

@oli-obk

miri engine: Fix run-time validation This fixes all false positives that came up when actually enabling this in miri. r? @oli-obk

bors · 2018-10-13T11:52:44Z

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

rust-highfive · 2018-10-13T11:54:09Z

📣 Toolstate changed by #54955!

Tested on commit 2d81989.
Direct link to PR: #54955

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

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

rust-highfive assigned oli-obk Oct 10, 2018

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

RalfJung force-pushed the miri-validate2 branch from 5df040e to 77599d3 Compare October 10, 2018 07:53

RalfJung mentioned this pull request Oct 10, 2018

WIP: Update for rustc validation fixes rust-lang/miri#472

Closed

This comment has been minimized.

Sign in to view

RalfJung force-pushed the miri-validate2 branch from 77599d3 to cc8a9c3 Compare October 10, 2018 17:21

oli-obk reviewed Oct 10, 2018

View reviewed changes

RalfJung mentioned this pull request Oct 11, 2018

rustup: Update for rustc validation fixes rust-lang/miri#473

Merged

This comment has been minimized.

Sign in to view

RalfJung force-pushed the miri-validate2 branch from a781cc8 to c54155e Compare October 11, 2018 08:31

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

RalfJung force-pushed the miri-validate2 branch from 2b6b4d9 to a967196 Compare October 11, 2018 09:15

oli-obk requested changes Oct 11, 2018

View reviewed changes

src/librustc_mir/interpret/validity.rs Outdated Show resolved Hide resolved

src/librustc_mir/interpret/memory.rs Show resolved Hide resolved

RalfJung force-pushed the miri-validate2 branch from a967196 to e415499 Compare October 11, 2018 11:13

oli-obk approved these changes Oct 11, 2018

View reviewed changes

RalfJung force-pushed the miri-validate2 branch from e415499 to 752034d Compare October 11, 2018 14:11

RalfJung mentioned this pull request Oct 12, 2018

Validate more things rust-lang/miri#477

Merged

This comment has been minimized.

Sign in to view

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

RalfJung added 12 commits October 13, 2018 09:09

fix validation around transmuting copy_op

5b75ec0

check return type even for uninhabited case

a05914e

validate return value on stack pop

f79a22c

size_and_align_of can return no result for extern types

93f53e5

seems like for generators we cannot access the freevars

d0c585c

foreign types: use size and align from layout

3272c98

make ENFORCE_VALIDITY a function

69576fc

miri needs this extra flexibility

Fix and test upvar name printing for validity

c96eb70

validation: accept pointers in integer arrays

dc4b277

address nits

b2ddd27

run-time validation: accept undef in int arrays, as we do for ints

06a4911

update miri

6426cbe

RalfJung force-pushed the miri-validate2 branch from a7a53f7 to 6426cbe Compare October 13, 2018 07:10

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

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

Auto merge of #54955 - RalfJung:miri-validate2, r=oli-obk

2d81989

miri engine: Fix run-time validation This fixes all false positives that came up when actually enabling this in miri. r? @oli-obk

bors merged commit 6426cbe into rust-lang:master Oct 13, 2018

This was referenced Oct 13, 2018

Report const eval error inside the query #53821

Merged

Update Cargo, build curl/OpenSSL statically via features #54919

Merged

RalfJung deleted the miri-validate2 branch October 13, 2018 14:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

miri engine: Fix run-time validation #54955

miri engine: Fix run-time validation #54955

RalfJung commented Oct 10, 2018

This comment has been minimized.

RalfJung commented Oct 10, 2018

oli-obk Oct 10, 2018

RalfJung Oct 11, 2018

oli-obk Oct 11, 2018

RalfJung Oct 11, 2018 •

edited

Loading

oli-obk Oct 11, 2018

RalfJung Oct 11, 2018

RalfJung Oct 11, 2018

This comment has been minimized.

oli-obk commented Oct 11, 2018

RalfJung commented Oct 11, 2018

bors commented Oct 11, 2018

RalfJung commented Oct 11, 2018

oli-obk commented Oct 11, 2018

bors commented Oct 11, 2018

RalfJung commented Oct 11, 2018

RalfJung commented Oct 11, 2018

bors commented Oct 11, 2018

oli-obk commented Oct 12, 2018

bors commented Oct 12, 2018

This comment has been minimized.

RalfJung commented Oct 13, 2018

bors commented Oct 13, 2018

bors commented Oct 13, 2018

bors commented Oct 13, 2018

rust-highfive commented Oct 13, 2018

		}
		// The closure is not local, or the freevars don't match up (seen for a generator!),

miri engine: Fix run-time validation #54955

miri engine: Fix run-time validation #54955

Conversation

RalfJung commented Oct 10, 2018

This comment has been minimized.

RalfJung commented Oct 10, 2018

oli-obk Oct 10, 2018

Choose a reason for hiding this comment

RalfJung Oct 11, 2018

Choose a reason for hiding this comment

oli-obk Oct 11, 2018

Choose a reason for hiding this comment

RalfJung Oct 11, 2018 • edited Loading

Choose a reason for hiding this comment

oli-obk Oct 11, 2018

Choose a reason for hiding this comment

RalfJung Oct 11, 2018

Choose a reason for hiding this comment

RalfJung Oct 11, 2018

Choose a reason for hiding this comment

This comment has been minimized.

oli-obk commented Oct 11, 2018

RalfJung commented Oct 11, 2018

bors commented Oct 11, 2018

RalfJung commented Oct 11, 2018

oli-obk commented Oct 11, 2018

bors commented Oct 11, 2018

RalfJung commented Oct 11, 2018

RalfJung commented Oct 11, 2018

bors commented Oct 11, 2018

oli-obk commented Oct 12, 2018

bors commented Oct 12, 2018

This comment has been minimized.

RalfJung commented Oct 13, 2018

bors commented Oct 13, 2018

bors commented Oct 13, 2018

bors commented Oct 13, 2018

rust-highfive commented Oct 13, 2018

RalfJung Oct 11, 2018 •

edited

Loading