This commit is contained in:
The Miri Cronjob Bot 2025-06-07 05:02:30 +00:00
parent 4c4904b54a
commit 4007b1937b
2 changed files with 10 additions and 3 deletions

View file

@ -169,8 +169,14 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
_ => throw_unsup_format!("unknown `miri_resolve_frame` flags {}", flags),
}
this.write_scalar(Scalar::from_u32(lineno), &this.project_field(dest, FieldIdx::from_u32(2))?)?;
this.write_scalar(Scalar::from_u32(colno), &this.project_field(dest, FieldIdx::from_u32(3))?)?;
this.write_scalar(
Scalar::from_u32(lineno),
&this.project_field(dest, FieldIdx::from_u32(2))?,
)?;
this.write_scalar(
Scalar::from_u32(colno),
&this.project_field(dest, FieldIdx::from_u32(3))?,
)?;
// Support a 4-field struct for now - this is deprecated
// and slated for removal.

View file

@ -286,7 +286,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
if op == epoll_ctl_add || op == epoll_ctl_mod {
// Read event bitmask and data from epoll_event passed by caller.
let mut events = this.read_scalar(&this.project_field(&event, FieldIdx::ZERO)?)?.to_u32()?;
let mut events =
this.read_scalar(&this.project_field(&event, FieldIdx::ZERO)?)?.to_u32()?;
let data = this.read_scalar(&this.project_field(&event, FieldIdx::ONE)?)?.to_u64()?;
// Unset the flag we support to discover if any unsupported flags are used.