bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor checking function target features during const-eval

Browse source 
* Split into its own function
* Do not build a `Vec` of unavailable features
This commit is contained in:
Eduardo Sánchez Muñoz 2023-07-16 16:07:55 +02:00
parent 3e8ce42d42
commit ae2a72deaa
1 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

47
compiler/rustc_const_eval/src/interpret/terminator.rs
View file

@ -503,24 +503,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
} }
} }
let attrs = self.tcx.codegen_fn_attrs(instance.def_id()); // Check that all target features required by the callee (i.e., from
let missing_features: Vec<_> = attrs // the attribute `#[target_feature(enable = ...)]`) are enabled at
.target_features // compile time.
.iter() self.check_fn_target_features(instance)?;
.copied()
.filter(|feature| !self.tcx.sess.target_features.contains(feature))
.collect();
if !missing_features.is_empty() {
let mut missing_features_str = String::from(missing_features[0].as_str());
for missing_feature in missing_features[1..].iter() {
missing_features_str.push(',');
missing_features_str.push_str(missing_feature.as_str());
}
throw_ub_custom!(
fluent::const_eval_unavailable_target_features_for_fn,
unavailable_feats = missing_features_str,
);
}
if !callee_fn_abi.can_unwind { if !callee_fn_abi.can_unwind {
// The callee cannot unwind, so force the `Unreachable` unwind handling. // The callee cannot unwind, so force the `Unreachable` unwind handling.
@ -805,6 +791,31 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
} }
} }
fn check_fn_target_features(&self, instance: ty::Instance<'tcx>) -> InterpResult<'tcx, ()> {
let attrs = self.tcx.codegen_fn_attrs(instance.def_id());
if attrs
.target_features
.iter()
.any(|feature| !self.tcx.sess.target_features.contains(feature))
{
throw_ub_custom!(
fluent::const_eval_unavailable_target_features_for_fn,
unavailable_feats = attrs
.target_features
.iter()
.filter(|&feature| !self.tcx.sess.target_features.contains(feature))
.fold(String::new(), |mut s, feature| {
if !s.is_empty() {
s.push_str(", ");
}
s.push_str(feature.as_str());
s
}),
);
}
Ok(())
}
fn drop_in_place( fn drop_in_place(
&mut self, &mut self,
place: &PlaceTy<'tcx, M::Provenance>, place: &PlaceTy<'tcx, M::Provenance>,