user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add comment about deprecation

Browse source
This commit is contained in:
Aaron Hill 2020-10-11 17:57:49 -04:00
parent 6a6767fa2a
commit c889eba4b2
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shims/backtrace.rs
View file

@ -101,8 +101,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let num_fields = dest.layout.layout.fields.count();
if !(4..=5).contains(&num_fields) {
// Always mention 5 fields, since the 4-field struct is only supported
// for backwards compatiblity. New code should declare 5 fields.
// Always mention 5 fields, since the 4-field struct
// is deprecated and slated for removal.
throw_ub_format!("bad declaration of miri_resolve_frame - should return a struct with 5 fields");
}
@ -133,6 +133,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
this.write_scalar(lineno_alloc, this.mplace_field(dest, 2)?.into())?;
this.write_scalar(colno_alloc, this.mplace_field(dest, 3)?.into())?;
// Support a 4-field struct for now - this is deprecated
// and slated for removal.
if num_fields == 5 {
this.write_scalar(fn_ptr, this.mplace_field(dest, 4)?.into())?;
}