Skip to content

Commit a24cf6b

Browse files
authored
Rollup merge of #129613 - RalfJung:interpret-target-feat, r=saethlin
interpret: do not make const-eval query result depend on tcx.sess The check against calling functions with missing target features uses `tcx.sess` to determine which target features are available. However, this can differ between different crates in a crate graph, so the same const-eval query can come to different conclusions about whether a constant evaluates successfully or not -- which is bad, we should consistently get the same result everywhere.
2 parents 6663db8 + f3534ca commit a24cf6b

File tree

2 files changed

+40
-6
lines changed

2 files changed

+40
-6
lines changed

src/machine.rs

+37-5
Original file line numberDiff line numberDiff line change
@@ -946,16 +946,48 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
946946
ecx.machine.validation == ValidationMode::Deep
947947
}
948948

949-
#[inline(always)]
950-
fn enforce_abi(_ecx: &MiriInterpCx<'tcx>) -> bool {
951-
true
952-
}
953-
954949
#[inline(always)]
955950
fn ignore_optional_overflow_checks(ecx: &MiriInterpCx<'tcx>) -> bool {
956951
!ecx.tcx.sess.overflow_checks()
957952
}
958953

954+
fn check_fn_target_features(
955+
ecx: &MiriInterpCx<'tcx>,
956+
instance: ty::Instance<'tcx>,
957+
) -> InterpResult<'tcx> {
958+
let attrs = ecx.tcx.codegen_fn_attrs(instance.def_id());
959+
if attrs
960+
.target_features
961+
.iter()
962+
.any(|feature| !ecx.tcx.sess.target_features.contains(&feature.name))
963+
{
964+
let unavailable = attrs
965+
.target_features
966+
.iter()
967+
.filter(|&feature| {
968+
!feature.implied && !ecx.tcx.sess.target_features.contains(&feature.name)
969+
})
970+
.fold(String::new(), |mut s, feature| {
971+
if !s.is_empty() {
972+
s.push_str(", ");
973+
}
974+
s.push_str(feature.name.as_str());
975+
s
976+
});
977+
let msg = format!(
978+
"calling a function that requires unavailable target features: {unavailable}"
979+
);
980+
// On WASM, this is not UB, but instead gets rejected during validation of the module
981+
// (see #84988).
982+
if ecx.tcx.sess.target.is_like_wasm {
983+
throw_machine_stop!(TerminationInfo::Abort(msg));
984+
} else {
985+
throw_ub_format!("{msg}");
986+
}
987+
}
988+
Ok(())
989+
}
990+
959991
#[inline(always)]
960992
fn find_mir_or_eval_fn(
961993
ecx: &mut MiriInterpCx<'tcx>,

tests/pass/function_calls/target_feature_wasm.rs renamed to tests/panic/target_feature_wasm.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
//@compile-flags: -C target-feature=-simd128
33

44
fn main() {
5-
// Calling functions with `#[target_feature]` is not unsound on WASM, see #84988
5+
// Calling functions with `#[target_feature]` is not unsound on WASM, see #84988.
6+
// But if the compiler actually uses the target feature, it will lead to an error when the module is loaded.
7+
// We emulate this with an "unsupported" error.
68
assert!(!cfg!(target_feature = "simd128"));
79
simd128_fn();
810
}

0 commit comments

Comments
 (0)