const-eval: disallow unwinding across functions that `!fn_can_unwind()` #85546

ghost · 2021-05-21T13:08:36Z

Following rust-lang/miri#1776 (comment), so r? @RalfJung

This PR turns unwind in StackPopCleanup::Goto into a new enum StackPopUnwind, with a NotAllowed variant to indicate that unwinding is not allowed. This variant is chosen based on rustc_middle::ty::layout::fn_can_unwind() in eval_fn_call() when pushing the frame. A check is added in unwind_to_block() to report UB if unwinding happens across a StackPopUnwind::NotAllowed frame.

Tested with Miri HEAD with minor changes and the rust-lang/miri#1776 branch with these changes.

rust-highfive · 2021-05-21T13:08:39Z

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

RalfJung · 2021-05-21T18:54:25Z

Tested with Miri HEAD with minor changes

Could you please prepare a Miri PR with just those changes? Then we can fix the toolstate ASAP without having to complete the other, much larger, PR.

compiler/rustc_middle/src/ty/layout.rs

compiler/rustc_mir/src/interpret/eval_context.rs

compiler/rustc_mir/src/interpret/terminator.rs

compiler/rustc_mir/src/interpret/eval_context.rs

bors · 2021-05-22T18:09:10Z

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

…at are called by `eval_fn_call()`

compiler/rustc_mir/src/interpret/terminator.rs

…:Cleanup)`

compiler/rustc_mir/src/interpret/eval_context.rs

RalfJung · 2021-05-27T21:48:49Z

LGTM modulo 2 small final nits. :)

RalfJung · 2021-05-28T07:32:14Z

Thanks a lot. :-)
@bors r+

bors · 2021-05-28T07:32:16Z

📌 Commit f6348f1 has been approved by RalfJung

bors · 2021-05-28T08:49:52Z

⌛ Testing commit f6348f1 with merge ce0d64e...

klensy · 2021-05-28T10:15:13Z

Not squashed commits (
There should really be some check to check if there any overwritten changes and suggest merging commits.

bors · 2021-05-28T11:30:49Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing ce0d64e to master...

rust-highfive · 2021-05-28T11:31:22Z

📣 Toolstate changed by #85546!

Tested on commit ce0d64e.
Direct link to PR: #85546

💔 miri on windows: test-pass → build-fail (cc @eddyb @oli-obk @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @eddyb @oli-obk @RalfJung).

@eddyb

Tested on commit rust-lang/rust@ce0d64e. Direct link to PR: <rust-lang/rust#85546> 💔 miri on windows: test-pass → build-fail (cc @eddyb @oli-obk @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @eddyb @oli-obk @RalfJung).

Fix toolstate for rust-lang/rust#85546 cc rust-lang/rust#85780

rust-highfive assigned RalfJung May 21, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2021

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_middle/src/ty/layout.rs Show resolved Hide resolved

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Outdated Show resolved Hide resolved

ghost commented May 21, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Show resolved Hide resolved

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2021

RalfJung reviewed May 22, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

hyd-dev added 4 commits May 23, 2021 04:20

const-eval: disallow unwinding across functions that !fn_can_unwind()

7b3e10c

Move the callee "can unwind" check to the right place

da0abad

Refactor match + if

8354051

Don't evaluate self.fn_can_unwind(...) if can_unwind is already true

e743eeb

ghost mentioned this pull request May 22, 2021

Fix toolstate for rust-lang/rust#85546 rust-lang/miri#1812

Merged

hyd-dev added 4 commits May 23, 2021 21:15

Cleanup(Option<_>) -> Cleanup(BasicBlock), Skip

b98d622

"unwind" -> "unwinding"

876fdcb

Pass StackPopUnwind to eval_fn_call() and some other functions th…

8ef3974

…at are called by `eval_fn_call()`

🤦

ac39f36

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 23, 2021

RalfJung reviewed May 24, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 24, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Show resolved Hide resolved

RalfJung reviewed May 24, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 24, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/terminator.rs Show resolved Hide resolved

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels May 24, 2021

hyd-dev added 5 commits May 25, 2021 03:42

Check whether unwinding is allowed before popping the stack frame

64044eb

can_unwind -> caller_can_unwind

4a7c9ba

Add a comment

116172d

Move the check to unwind_to_block

38472e0

Use match instead of `.map_or(StackPopUnwind::Skip, StackPopUnwind:…

0777f1b

…:Cleanup)`

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 26, 2021

RalfJung reviewed May 27, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 27, 2021

View reviewed changes

compiler/rustc_mir/src/interpret/eval_context.rs Outdated Show resolved Hide resolved

hyd-dev added 2 commits May 28, 2021 09:18

"a frame" -> "a stack frame"

4ad21c9

Rewrite to a match

f6348f1

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 May 28, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label May 28, 2021

bors merged commit ce0d64e into rust-lang:master May 28, 2021

rustbot added this to the 1.54.0 milestone May 28, 2021

rust-highfive mentioned this pull request May 28, 2021

miri no longer builds after rust-lang/rust#85546 #85780

Closed

ghost deleted the unwind branch May 28, 2021 14:01

bors added a commit to rust-lang/miri that referenced this pull request May 28, 2021

Auto merge of #1812 - hyd-dev:85546, r=RalfJung

4fa9363

Fix toolstate for rust-lang/rust#85546 cc rust-lang/rust#85780

const-eval: disallow unwinding across functions that !fn_can_unwind() #85546

const-eval: disallow unwinding across functions that !fn_can_unwind() #85546

Uh oh!

Conversation

ghost commented May 21, 2021 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented May 21, 2021

Uh oh!

RalfJung commented May 21, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented May 22, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented May 27, 2021

Uh oh!

RalfJung commented May 28, 2021

Uh oh!

bors commented May 28, 2021

Uh oh!

bors commented May 28, 2021

Uh oh!

klensy commented May 28, 2021

Uh oh!

bors commented May 28, 2021

Uh oh!

rust-highfive commented May 28, 2021

Uh oh!

Uh oh!

const-eval: disallow unwinding across functions that `!fn_can_unwind()` #85546

const-eval: disallow unwinding across functions that `!fn_can_unwind()` #85546

ghost commented May 21, 2021 •

edited by ghost

Loading