use monomorphize method on type and only have one call site for eval_mir_constant_to_operand

Author: Jamesbarford

compiler/rustc_codegen_ssa/src/mir/operand.rs

@@ -636,23 +636,19 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             }
 
             mir::Operand::Constant(ref constant) => {
-                let constant_ty = constant.ty();
+                let constant_ty = self.monomorphize(constant.ty());
                 // Make sure this type is actually passed as an immediate vector.
                 // (In particular, this excludes packed SIMD vectors.)
                 if constant_ty.is_simd() {
                     let layout = bx.layout_of(constant_ty);
-                    return match layout.abi {
-                        Abi::Vector { .. } => {
-                            let (llval, ty) = self.immediate_const_vector(bx, constant);
-                            OperandRef {
-                                val: OperandValue::Immediate(llval),
-                                layout: bx.layout_of(ty),
-                            }
-                        }
-                        _ => self.eval_mir_constant_to_operand(bx, constant),
-                    };
+                    if let Abi::Vector { .. } = layout.abi {
+                        let (llval, ty) = self.immediate_const_vector(bx, constant);
+                        return OperandRef {
+                            val: OperandValue::Immediate(llval),
+                            layout: bx.layout_of(ty),
+                        };
+                    }
                 }
-
                 self.eval_mir_constant_to_operand(bx, constant)
             }
         }