panic_impl is another way to panic
This commit is contained in:
parent
661ed7b82d
commit
48ac35f072
@ -39,12 +39,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
|
|||||||
if this.tcx.is_foreign_item(instance.def_id()) {
|
if this.tcx.is_foreign_item(instance.def_id()) {
|
||||||
// An external function that we cannot find MIR for, but we can still run enough
|
// An external function that we cannot find MIR for, but we can still run enough
|
||||||
// of them to make miri viable.
|
// of them to make miri viable.
|
||||||
this.emulate_foreign_item(
|
this.emulate_foreign_item(instance.def_id(), args, dest, ret)?;
|
||||||
instance.def_id(),
|
|
||||||
args,
|
|
||||||
dest.unwrap(),
|
|
||||||
ret.unwrap(),
|
|
||||||
)?;
|
|
||||||
// `goto_block` already handled
|
// `goto_block` already handled
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
@ -59,8 +54,8 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
|
|||||||
&mut self,
|
&mut self,
|
||||||
def_id: DefId,
|
def_id: DefId,
|
||||||
args: &[OpTy<'tcx, Borrow>],
|
args: &[OpTy<'tcx, Borrow>],
|
||||||
dest: PlaceTy<'tcx, Borrow>,
|
dest: Option<PlaceTy<'tcx, Borrow>>,
|
||||||
ret: mir::BasicBlock,
|
ret: Option<mir::BasicBlock>,
|
||||||
) -> EvalResult<'tcx> {
|
) -> EvalResult<'tcx> {
|
||||||
let this = self.eval_context_mut();
|
let this = self.eval_context_mut();
|
||||||
let attrs = this.tcx.get_attrs(def_id);
|
let attrs = this.tcx.get_attrs(def_id);
|
||||||
@ -70,9 +65,23 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
|
|||||||
};
|
};
|
||||||
// Strip linker suffixes (seen on 32bit macOS)
|
// Strip linker suffixes (seen on 32bit macOS)
|
||||||
let link_name = link_name.trim_end_matches("$UNIX2003");
|
let link_name = link_name.trim_end_matches("$UNIX2003");
|
||||||
|
|
||||||
let tcx = &{this.tcx.tcx};
|
let tcx = &{this.tcx.tcx};
|
||||||
|
|
||||||
|
// first: functions that could diverge
|
||||||
|
match &link_name[..] {
|
||||||
|
"__rust_start_panic" | "panic_impl" => {
|
||||||
|
return err!(MachineError("the evaluated program panicked".to_string()));
|
||||||
|
}
|
||||||
|
_ => if dest.is_none() {
|
||||||
|
return err!(Unimplemented(
|
||||||
|
format!("can't call diverging foreign function: {}", link_name),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// now: functions that assume a ret and dest
|
||||||
|
let dest = dest.expect("we already checked for a dest");
|
||||||
|
let ret = ret.expect("dest is Some but ret is None");
|
||||||
match &link_name[..] {
|
match &link_name[..] {
|
||||||
"malloc" => {
|
"malloc" => {
|
||||||
let size = this.read_scalar(args[0])?.to_usize(this)?;
|
let size = this.read_scalar(args[0])?.to_usize(this)?;
|
||||||
@ -245,9 +254,6 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
"__rust_start_panic" =>
|
|
||||||
return err!(MachineError("the evaluated program panicked".to_string())),
|
|
||||||
|
|
||||||
"memcmp" => {
|
"memcmp" => {
|
||||||
let left = this.read_scalar(args[0])?.not_undef()?;
|
let left = this.read_scalar(args[0])?.not_undef()?;
|
||||||
let right = this.read_scalar(args[1])?.not_undef()?;
|
let right = this.read_scalar(args[1])?.not_undef()?;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
//error-pattern: the evaluated program panicked
|
//error-pattern: the evaluated program panicked
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
assert_eq!(5, 6);
|
std::panic!("panicking from libstd");
|
||||||
}
|
}
|
5
tests/compile-fail/panic2.rs
Normal file
5
tests/compile-fail/panic2.rs
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
//error-pattern: the evaluated program panicked
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
std::panic!("{}-panicking from libstd", 42);
|
||||||
|
}
|
5
tests/compile-fail/panic3.rs
Normal file
5
tests/compile-fail/panic3.rs
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
//error-pattern: the evaluated program panicked
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
core::panic!("panicking from libcore");
|
||||||
|
}
|
5
tests/compile-fail/panic4.rs
Normal file
5
tests/compile-fail/panic4.rs
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
//error-pattern: the evaluated program panicked
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
core::panic!("{}-panicking from libcore", 42);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user