Merge pull request #5300 from rust-lang/rustup-2026-09-02

Automatic Rustup

Author: RalfJung

rust-version

@@ -1 +1 @@
-17fd5b8a37b6667b6cc137f3cc35f09759768a3b
+edc52f87c28f328c61685a02c47887a5cec7d767

src/intrinsics/math.rs

@@ -17,18 +17,11 @@ fn sqrt<'tcx, F: Float + FloatConvert<F> + Into<Scalar>>(
 }
 
 /// Determine which float operation on which type this is.
-fn is_host_unary_float_op(intrinsic_name: &str) -> Option<(FloatTy, HostUnaryFloatOp)> {
-    let (op, ty) = intrinsic_name.rsplit_once('f')?;
-
-    let float_ty = match ty {
-        "16" => FloatTy::F16,
-        "32" => FloatTy::F32,
-        "64" => FloatTy::F64,
-        "128" => FloatTy::F128,
-        _ => return None,
-    };
-
-    let host_float_op = match op {
+fn is_host_unary_float_op(
+    intrinsic_name: &str,
+    generic_args: ty::GenericArgsRef<'_>,
+) -> Option<(FloatTy, HostUnaryFloatOp)> {
+    let host_float_op = match intrinsic_name {
         "sin" => HostUnaryFloatOp::Sin,
         "cos" => HostUnaryFloatOp::Cos,
         "exp" => HostUnaryFloatOp::Exp,
@@ -39,6 +32,9 @@ fn is_host_unary_float_op(intrinsic_name: &str) -> Option<(FloatTy, HostUnaryFlo
         _ => return None,
     };
 
+    let ty::Float(float_ty) = *generic_args.type_at(0).kind() else {
+        bug!("`{intrinsic_name}` intrinsic called on non-float type");
+    };
     Some((float_ty, host_float_op))
 }
 
@@ -96,7 +92,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     fn emulate_math_intrinsic(
         &mut self,
         intrinsic_name: &str,
-        _generic_args: ty::GenericArgsRef<'tcx>,
+        generic_args: ty::GenericArgsRef<'tcx>,
         args: &[OpTy<'tcx>],
         dest: &PlaceTy<'tcx>,
     ) -> InterpResult<'tcx, EmulateItemResult> {
@@ -179,7 +175,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
 
             // Operations that need host floats.
-            _ if let Some((float_ty, op)) = is_host_unary_float_op(intrinsic_name) => {
+            _ if let Some((float_ty, op)) =
+                is_host_unary_float_op(intrinsic_name, generic_args) =>
+            {
                 let [f] = check_intrinsic_arg_count(args)?;
                 match float_ty {
                     FloatTy::F16 => host_unary_float_op::<HalfS>(this, f, op, dest)?,

src/math.rs

@@ -230,11 +230,11 @@ where
 }
 
 /// For the intrinsics:
-/// - sinf32, sinf64, sinhf, sinh
-/// - cosf32, cosf64, coshf, cosh
+/// - sin, sinhf, sinh
+/// - cos, coshf, cosh
 /// - tanhf, tanh, atanf, atan, atan2f, atan2
-/// - expf32, expf64, exp2f32, exp2f64
-/// - logf32, logf64, log2f32, log2f64, log10f32, log10f64
+/// - exp, exp2
+/// - log, log2, log10
 /// - powf32, powf64
 /// - erff, erf, erfcf, erfc
 /// - hypotf, hypot