put back const_struct()

Author: Jamesbarford

compiler/rustc_codegen_ssa/src/mir/constant.rs

@@ -66,10 +66,11 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         constant: &mir::ConstOperand<'tcx>,
     ) -> (Bx::Value, Ty<'tcx>) {
         let ty = self.monomorphize(constant.ty());
+        let ty_is_simd = ty.is_simd();
         // FIXME: ideally we'd assert that this is a SIMD type, but simd_shuffle
         // in its current form relies on a regular array being passed as an
         // immediate argument. This hack can be removed once that is fixed.
-        let field_ty = if ty.is_simd() {
+        let field_ty = if ty_is_simd {
             ty.simd_size_and_type(bx.tcx()).1
         } else {
             ty.builtin_index().unwrap()
@@ -106,7 +107,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                         }
                     })
                     .collect();
-                bx.const_vector(&values)
+                if ty_is_simd { bx.const_vector(&values) } else { bx.const_struct(&values, false) }
             })
             .unwrap_or_else(|| {
                 bx.tcx().dcx().emit_err(errors::ShuffleIndicesEvaluation { span: constant.span });