about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-07-20 08:53:09 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-07-20 08:53:09 +0000
commitc7428d50520446ccd44ca89bbbf4ff7a4725570e (patch)
tree72425a8094915722c16d07a3c046cdf07c9e3d56
parent9e5a67e57f715ec5eda915db1261cdf4c4a04642 (diff)
downloadrust-c7428d50520446ccd44ca89bbbf4ff7a4725570e.tar.gz
rust-c7428d50520446ccd44ca89bbbf4ff7a4725570e.zip
Monomorphize constants before inspecting them
-rw-r--r--compiler/rustc_codegen_ssa/src/mir/constant.rs2
-rw-r--r--tests/ui/simd/shuffle.rs5
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/constant.rs b/compiler/rustc_codegen_ssa/src/mir/constant.rs
index 47a166e4e1b..babcf9bee24 100644
--- a/compiler/rustc_codegen_ssa/src/mir/constant.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/constant.rs
@@ -65,7 +65,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         &self,
         constant: &mir::Constant<'tcx>,
     ) -> Result<Option<ty::ValTree<'tcx>>, ErrorHandled> {
-        let uv = match constant.literal {
+        let uv = match self.monomorphize(constant.literal) {
             mir::ConstantKind::Unevaluated(uv, _) => uv.shrink(),
             mir::ConstantKind::Ty(c) => match c.kind() {
                 // A constant that came from a const generic but was then used as an argument to old-style
diff --git a/tests/ui/simd/shuffle.rs b/tests/ui/simd/shuffle.rs
index de41c9e25dd..461243d4892 100644
--- a/tests/ui/simd/shuffle.rs
+++ b/tests/ui/simd/shuffle.rs
@@ -1,4 +1,7 @@
-//run-pass
+// run-pass
+// revisions: opt noopt
+//[noopt] compile-flags: -Copt-level=0
+//[opt] compile-flags: -O
 #![feature(repr_simd, platform_intrinsics)]
 #![allow(incomplete_features)]
 #![feature(adt_const_params)]