Skip to content

Commit 3a9920b

Browse files
borsbors
committed
Auto merge of #2835 - saethlin:rustup, r=oli-obk
rustup `@oli-obk` I think this is the resolution we agreed to on Zulip?
2 parents f6900e3 + 35d6927 commit 3a9920b

17 files changed

+93
-61
lines changed

‎rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bd991d9953625e9d51fc4fcb5e19aa9c3ea598a8
1+
d4be8efc6296bace5b1e165f1b34d3c6da76aa8e

‎src/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
951951
if this.machine.panic_on_unsupported {
952952
// message is slightly different here to make automated analysis easier
953953
let error_msg = format!("unsupported Miri functionality: {}", error_msg.as_ref());
954-
this.start_panic(error_msg.as_ref(), StackPopUnwind::Skip)?;
954+
this.start_panic(error_msg.as_ref(), mir::UnwindAction::Continue)?;
955955
Ok(())
956956
} else {
957957
throw_unsup_format!("{}", error_msg.as_ref());

‎src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(io_error_more)]
66
#![feature(variant_count)]
77
#![feature(yeet_expr)]
8-
#![feature(is_some_and)]
98
#![feature(nonzero_ops)]
109
#![feature(local_key_cell_methods)]
1110
#![feature(is_terminal)]
@@ -125,10 +124,13 @@ pub use crate::tag_gc::{EvalContextExt as _, VisitTags};
125124

126125
/// Insert rustc arguments at the beginning of the argument list that Miri wants to be
127126
/// set per default, for maximal validation power.
127+
/// Also disable the MIR pass that inserts an alignment check on every pointer dereference. Miri
128+
/// does that too, and with a better error message.
128129
pub const MIRI_DEFAULT_ARGS: &[&str] = &[
129130
"--cfg=miri",
130131
"-Zalways-encode-mir",
131132
"-Zextra-const-ub-checks",
132133
"-Zmir-emit-retag",
133134
"-Zmir-opt-level=0",
135+
"-Zmir-enable-passes=-CheckAlignment",
134136
];

‎src/machine.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
834834
args: &[OpTy<'tcx, Provenance>],
835835
dest: &PlaceTy<'tcx, Provenance>,
836836
ret: Option<mir::BasicBlock>,
837-
unwind: StackPopUnwind,
837+
unwind: mir::UnwindAction,
838838
) -> InterpResult<'tcx, Option<(&'mir mir::Body<'tcx>, ty::Instance<'tcx>)>> {
839839
ecx.find_mir_or_eval_fn(instance, abi, args, dest, ret, unwind)
840840
}
@@ -847,7 +847,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
847847
args: &[OpTy<'tcx, Provenance>],
848848
dest: &PlaceTy<'tcx, Provenance>,
849849
ret: Option<mir::BasicBlock>,
850-
_unwind: StackPopUnwind,
850+
_unwind: mir::UnwindAction,
851851
) -> InterpResult<'tcx> {
852852
ecx.call_dlsym(fn_val, abi, args, dest, ret)
853853
}
@@ -859,7 +859,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
859859
args: &[OpTy<'tcx, Provenance>],
860860
dest: &PlaceTy<'tcx, Provenance>,
861861
ret: Option<mir::BasicBlock>,
862-
unwind: StackPopUnwind,
862+
unwind: mir::UnwindAction,
863863
) -> InterpResult<'tcx> {
864864
ecx.call_intrinsic(instance, args, dest, ret, unwind)
865865
}
@@ -868,7 +868,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
868868
fn assert_panic(
869869
ecx: &mut MiriInterpCx<'mir, 'tcx>,
870870
msg: &mir::AssertMessage<'tcx>,
871-
unwind: Option<mir::BasicBlock>,
871+
unwind: mir::UnwindAction,
872872
) -> InterpResult<'tcx> {
873873
ecx.assert_panic(msg, unwind)
874874
}

‎src/shims/foreign_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
258258
args: &[OpTy<'tcx, Provenance>],
259259
dest: &PlaceTy<'tcx, Provenance>,
260260
ret: Option<mir::BasicBlock>,
261-
unwind: StackPopUnwind,
261+
unwind: mir::UnwindAction,
262262
) -> InterpResult<'tcx, Option<(&'mir mir::Body<'tcx>, ty::Instance<'tcx>)>> {
263263
let this = self.eval_context_mut();
264264
let link_name = this.item_link_name(def_id);

‎src/shims/intrinsics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
2626
args: &[OpTy<'tcx, Provenance>],
2727
dest: &PlaceTy<'tcx, Provenance>,
2828
ret: Option<mir::BasicBlock>,
29-
_unwind: StackPopUnwind,
29+
_unwind: mir::UnwindAction,
3030
) -> InterpResult<'tcx> {
3131
let this = self.eval_context_mut();
3232

‎src/shims/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
3434
args: &[OpTy<'tcx, Provenance>],
3535
dest: &PlaceTy<'tcx, Provenance>,
3636
ret: Option<mir::BasicBlock>,
37-
unwind: StackPopUnwind,
37+
unwind: mir::UnwindAction,
3838
) -> InterpResult<'tcx, Option<(&'mir mir::Body<'tcx>, ty::Instance<'tcx>)>> {
3939
let this = self.eval_context_mut();
4040
trace!("eval_fn_call: {:#?}, {:?}", instance, dest);
@@ -70,7 +70,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
7070
align_op: &OpTy<'tcx, Provenance>,
7171
dest: &PlaceTy<'tcx, Provenance>,
7272
ret: Option<mir::BasicBlock>,
73-
unwind: StackPopUnwind,
73+
unwind: mir::UnwindAction,
7474
) -> InterpResult<'tcx, bool> {
7575
let this = self.eval_context_mut();
7676
let ret = ret.unwrap();

‎src/shims/panic.rs

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
5353
abi: Abi,
5454
link_name: Symbol,
5555
args: &[OpTy<'tcx, Provenance>],
56-
unwind: StackPopUnwind,
56+
unwind: mir::UnwindAction,
5757
) -> InterpResult<'tcx> {
5858
let this = self.eval_context_mut();
5959

@@ -106,7 +106,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
106106
&[data.into()],
107107
None,
108108
// Directly return to caller.
109-
StackPopCleanup::Goto { ret: Some(ret), unwind: StackPopUnwind::Skip },
109+
StackPopCleanup::Goto { ret: Some(ret), unwind: mir::UnwindAction::Continue },
110110
)?;
111111

112112
// We ourselves will return `0`, eventually (will be overwritten if we catch a panic).
@@ -157,7 +157,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
157157
&[catch_unwind.data.into(), payload.into()],
158158
None,
159159
// Directly return to caller of `try`.
160-
StackPopCleanup::Goto { ret: Some(catch_unwind.ret), unwind: StackPopUnwind::Skip },
160+
StackPopCleanup::Goto {
161+
ret: Some(catch_unwind.ret),
162+
unwind: mir::UnwindAction::Continue,
163+
},
161164
)?;
162165

163166
// We pushed a new stack frame, the engine should not do any jumping now!
@@ -168,7 +171,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
168171
}
169172

170173
/// Start a panic in the interpreter with the given message as payload.
171-
fn start_panic(&mut self, msg: &str, unwind: StackPopUnwind) -> InterpResult<'tcx> {
174+
fn start_panic(&mut self, msg: &str, unwind: mir::UnwindAction) -> InterpResult<'tcx> {
172175
let this = self.eval_context_mut();
173176

174177
// First arg: message.
@@ -189,7 +192,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
189192
fn assert_panic(
190193
&mut self,
191194
msg: &mir::AssertMessage<'tcx>,
192-
unwind: Option<mir::BasicBlock>,
195+
unwind: mir::UnwindAction,
193196
) -> InterpResult<'tcx> {
194197
use rustc_middle::mir::AssertKind::*;
195198
let this = self.eval_context_mut();
@@ -211,13 +214,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
211214
Abi::Rust,
212215
&[index.into(), len.into()],
213216
None,
214-
StackPopCleanup::Goto {
215-
ret: None,
216-
unwind: match unwind {
217-
Some(cleanup) => StackPopUnwind::Cleanup(cleanup),
218-
None => StackPopUnwind::Skip,
219-
},
220-
},
217+
StackPopCleanup::Goto { ret: None, unwind },
221218
)?;
222219
}
223220
MisalignedPointerDereference { required, found } => {
@@ -238,25 +235,13 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
238235
Abi::Rust,
239236
&[required.into(), found.into()],
240237
None,
241-
StackPopCleanup::Goto {
242-
ret: None,
243-
unwind: match unwind {
244-
Some(cleanup) => StackPopUnwind::Cleanup(cleanup),
245-
None => StackPopUnwind::Skip,
246-
},
247-
},
238+
StackPopCleanup::Goto { ret: None, unwind },
248239
)?;
249240
}
250241

251242
_ => {
252243
// Forward everything else to `panic` lang item.
253-
this.start_panic(
254-
msg.description(),
255-
match unwind {
256-
Some(cleanup) => StackPopUnwind::Cleanup(cleanup),
257-
None => StackPopUnwind::Skip,
258-
},
259-
)?;
244+
this.start_panic(msg.description(), unwind)?;
260245
}
261246
}
262247
Ok(())

‎tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind2.rs:LL:CC
22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
3-
error: abnormal termination: the program aborted execution
3+
error: abnormal termination: panic in a function that cannot unwind
44
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
55
|
66
LL | / extern "C-unwind" fn nounwind() {
77
LL | |
88
LL | |
99
LL | | panic!();
1010
LL | | }
11-
| |_^ the program aborted execution
11+
| |_^ panic in a function that cannot unwind
1212
|
1313
= note: inside `nounwind` at $DIR/exported_symbol_bad_unwind2.rs:LL:CC
1414
note: inside `main`

‎tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind2.rs:LL:CC
22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
3-
error: abnormal termination: the program aborted execution
3+
error: abnormal termination: panic in a function that cannot unwind
44
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
55
|
66
LL | / extern "C-unwind" fn nounwind() {
77
LL | |
88
LL | |
99
LL | | panic!();
1010
LL | | }
11-
| |_^ the program aborted execution
11+
| |_^ panic in a function that cannot unwind
1212
|
1313
= note: inside `nounwind` at $DIR/exported_symbol_bad_unwind2.rs:LL:CC
1414
note: inside `main`

0 commit comments

Comments
 (0)