]> git.lizzy.rs Git - rust.git/blobdiff - src/base.rs
Rustup to rustc 1.40.0-nightly (9e346646e 2019-11-08)
[rust.git] / src / base.rs
index 17abee4a003d701b98f95352d6681db67748688d..007ff5390de5d0a64d1bbce41aca53d52ae6aa37 100644 (file)
@@ -2,7 +2,7 @@
 
 use crate::prelude::*;
 
-pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
+pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     cx: &mut crate::CodegenCx<'clif, 'tcx, B>,
     instance: Instance<'tcx>,
     linkage: Linkage,
@@ -17,7 +17,7 @@ pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
     let mut debug_context = cx
         .debug_context
         .as_mut()
-        .map(|debug_context| FunctionDebugContext::new(tcx, debug_context, mir, &name, &sig));
+        .map(|debug_context| FunctionDebugContext::new(tcx, debug_context, mir, func_id, &name, &sig));
 
     // Make FunctionBuilder
     let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
@@ -48,15 +48,13 @@ pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
         local_map: HashMap::new(),
 
         clif_comments,
-        constants: &mut cx.ccx,
+        constants_cx: &mut cx.constants_cx,
         caches: &mut cx.caches,
         source_info_set: indexmap::IndexSet::new(),
     };
 
-    with_unimpl_span(fx.mir.span, || {
-        crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
-        codegen_fn_content(&mut fx);
-    });
+    crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
+    codegen_fn_content(&mut fx);
 
     // Recover all necessary data from fx, before accessing func will prevent future access to it.
     let instance = fx.instance;
@@ -72,15 +70,22 @@ pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
     // Define function
     let context = &mut cx.caches.context;
     context.func = func;
-    cx.module
-        .define_function(func_id, context)
-        .unwrap();
+    cx.module.define_function(func_id, context).unwrap();
 
-    let value_ranges = context.build_value_labels_ranges(cx.module.isa()).expect("value location ranges");
+    let value_ranges = context
+        .build_value_labels_ranges(cx.module.isa())
+        .expect("value location ranges");
 
     // Write optimized function to file for debugging
     #[cfg(debug_assertions)]
-    crate::pretty_clif::write_clif_file(cx.tcx, "opt", instance, &context.func, &clif_comments, Some(&value_ranges));
+    crate::pretty_clif::write_clif_file(
+        cx.tcx,
+        "opt",
+        instance,
+        &context.func,
+        &clif_comments,
+        Some(&value_ranges),
+    );
 
     // Define debuginfo for function
     let isa = cx.module.isa();
@@ -110,7 +115,7 @@ fn verify_func(tcx: TyCtxt, writer: &crate::pretty_clif::CommentWriter, func: &F
     }
 }
 
-fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>) {
+fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
     for (bb, bb_data) in fx.mir.basic_blocks().iter_enumerated() {
         if bb_data.is_cleanup {
             // Unwinding after panicking is not supported
@@ -155,6 +160,13 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 target,
                 cleanup: _,
             } => {
+                if !fx.tcx.sess.overflow_checks() {
+                    if let mir::interpret::PanicInfo::OverflowNeg = *msg {
+                        let target = fx.get_ebb(*target);
+                        fx.bcx.ins().jump(target, &[]);
+                        continue;
+                    }
+                }
                 let cond = trans_operand(fx, cond).load_scalar(fx);
                 // TODO HACK brz/brnz for i8/i16 is not yet implemented
                 let cond = fx.bcx.ins().uextend(types::I32, cond);
@@ -164,7 +176,14 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 } else {
                     fx.bcx.ins().brz(cond, target, &[]);
                 };
-                trap_panic(fx, format!("[panic] Assert {:?} at {:?} failed.", msg, bb_data.terminator().source_info.span));
+                trap_panic(
+                    fx,
+                    format!(
+                        "[panic] Assert {:?} at {:?} failed.",
+                        msg,
+                        bb_data.terminator().source_info.span
+                    ),
+                );
             }
 
             TerminatorKind::SwitchInt {
@@ -189,7 +208,13 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 cleanup: _,
                 from_hir_call: _,
             } => {
-                crate::abi::codegen_terminator_call(fx, func, args, destination);
+                crate::abi::codegen_terminator_call(
+                    fx,
+                    func,
+                    args,
+                    destination,
+                    bb_data.terminator().source_info.span,
+                );
             }
             TerminatorKind::Resume | TerminatorKind::Abort => {
                 trap_unreachable(fx, "[corruption] Unwinding bb reached.");
@@ -222,8 +247,8 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
     fx.bcx.finalize();
 }
 
-fn trans_stmt<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+fn trans_stmt<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     cur_ebb: Ebb,
     stmt: &Statement<'tcx>,
 ) {
@@ -246,60 +271,12 @@ fn trans_stmt<'a, 'tcx: 'a>(
             variant_index,
         } => {
             let place = trans_place(fx, place);
-            let layout = place.layout();
-            if layout.for_variant(&*fx, *variant_index).abi == layout::Abi::Uninhabited {
-                return;
-            }
-            match layout.variants {
-                layout::Variants::Single { index } => {
-                    assert_eq!(index, *variant_index);
-                }
-                layout::Variants::Multiple {
-                    discr: _,
-                    discr_index,
-                    discr_kind: layout::DiscriminantKind::Tag,
-                    variants: _,
-                } => {
-                    let ptr = place.place_field(fx, mir::Field::new(discr_index));
-                    let to = layout
-                        .ty
-                        .discriminant_for_variant(fx.tcx, *variant_index)
-                        .unwrap()
-                        .val;
-                    let discr = CValue::const_val(fx, ptr.layout().ty, to);
-                    ptr.write_cvalue(fx, discr);
-                }
-                layout::Variants::Multiple {
-                    discr: _,
-                    discr_index,
-                    discr_kind: layout::DiscriminantKind::Niche {
-                        dataful_variant,
-                        ref niche_variants,
-                        niche_start,
-                    },
-                    variants: _,
-                } => {
-                    if *variant_index != dataful_variant {
-                        let niche = place.place_field(fx, mir::Field::new(discr_index));
-                        //let niche_llty = niche.layout.immediate_llvm_type(bx.cx);
-                        let niche_value =
-                            ((variant_index.as_u32() - niche_variants.start().as_u32()) as u128)
-                                .wrapping_add(niche_start);
-                        // FIXME(eddyb) Check the actual primitive type here.
-                        let niche_llval = if niche_value == 0 {
-                            CValue::const_val(fx, niche.layout().ty, 0)
-                        } else {
-                            CValue::const_val(fx, niche.layout().ty, niche_value)
-                        };
-                        niche.write_cvalue(fx, niche_llval);
-                    }
-                }
-            }
+            crate::discriminant::codegen_set_discriminant(fx, place, *variant_index);
         }
-        StatementKind::Assign(to_placerval) => {
-            let lval = trans_place(fx, to_place);
+        StatementKind::Assign(to_place_and_rval) => {
+            let lval = trans_place(fx, &to_place_and_rval.0);
             let dest_layout = lval.layout();
-            match &**rval {
+            match &to_place_and_rval.1 {
                 Rvalue::Use(operand) => {
                     let val = trans_operand(fx, operand);
                     lval.write_cvalue(fx, val);
@@ -309,40 +286,23 @@ fn trans_stmt<'a, 'tcx: 'a>(
                     place.write_place_ref(fx, lval);
                 }
                 Rvalue::BinaryOp(bin_op, lhs, rhs) => {
-                    let ty = fx.monomorphize(&lhs.ty(fx.mir, fx.tcx));
                     let lhs = trans_operand(fx, lhs);
                     let rhs = trans_operand(fx, rhs);
 
-                    let res = match ty.sty {
-                        ty::Bool => crate::num::trans_bool_binop(fx, *bin_op, lhs, rhs),
-                        ty::Uint(_) => {
-                            crate::num::trans_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, false)
-                        }
-                        ty::Int(_) => {
-                            crate::num::trans_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, true)
-                        }
-                        ty::Float(_) => crate::num::trans_float_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::Char => crate::num::trans_char_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::RawPtr(..) | ty::FnPtr(..) => {
-                            crate::num::trans_ptr_binop(fx, *bin_op, lhs, rhs, lval.layout().ty)
-                        }
-                        _ => unimplemented!("binop {:?} for {:?}", bin_op, ty),
-                    };
+                    let res = crate::num::codegen_binop(fx, *bin_op, lhs, rhs);
                     lval.write_cvalue(fx, res);
                 }
                 Rvalue::CheckedBinaryOp(bin_op, lhs, rhs) => {
-                    let ty = fx.monomorphize(&lhs.ty(fx.mir, fx.tcx));
                     let lhs = trans_operand(fx, lhs);
                     let rhs = trans_operand(fx, rhs);
 
-                    let signed = type_sign(ty);
-
                     let res = if !fx.tcx.sess.overflow_checks() {
-                        let val = crate::num::trans_int_binop(fx, *bin_op, lhs, rhs, lhs.layout().ty, signed).load_scalar(fx);
+                        let val =
+                            crate::num::trans_int_binop(fx, *bin_op, lhs, rhs).load_scalar(fx);
                         let is_overflow = fx.bcx.ins().iconst(types::I8, 0);
                         CValue::by_val_pair(val, is_overflow, lval.layout())
                     } else {
-                        crate::num::trans_checked_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, signed)
+                        crate::num::trans_checked_int_binop(fx, *bin_op, lhs, rhs)
                     };
 
                     lval.write_cvalue(fx, res);
@@ -353,39 +313,36 @@ fn trans_stmt<'a, 'tcx: 'a>(
                     let val = operand.load_scalar(fx);
                     let res = match un_op {
                         UnOp::Not => {
-                            match layout.ty.sty {
+                            match layout.ty.kind {
                                 ty::Bool => {
                                     let val = fx.bcx.ins().uextend(types::I32, val); // WORKAROUND for CraneStation/cranelift#466
                                     let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
-                                    fx.bcx.ins().bint(types::I8, res)
+                                    CValue::by_val(fx.bcx.ins().bint(types::I8, res), layout)
                                 }
                                 ty::Uint(_) | ty::Int(_) => {
-                                    fx.bcx.ins().bnot(val)
+                                    CValue::by_val(fx.bcx.ins().bnot(val), layout)
                                 }
                                 _ => unimplemented!("un op Not for {:?}", layout.ty),
                             }
                         }
-                        UnOp::Neg => match layout.ty.sty {
+                        UnOp::Neg => match layout.ty.kind {
                             ty::Int(_) => {
-                                let clif_ty = fx.clif_type(layout.ty).unwrap();
-                                if clif_ty == types::I128 {
-                                    crate::trap::trap_unreachable_ret_value(fx, layout, "i128 neg is not yet supported").load_scalar(fx)
-                                } else {
-                                    let zero = fx.bcx.ins().iconst(clif_ty, 0);
-                                    fx.bcx.ins().isub(zero, val)
-                                }
+                                let zero = CValue::const_val(fx, layout.ty, 0);
+                                crate::num::trans_int_binop(fx, BinOp::Sub, zero, operand)
+                            }
+                            ty::Float(_) => {
+                                CValue::by_val(fx.bcx.ins().fneg(val), layout)
                             }
-                            ty::Float(_) => fx.bcx.ins().fneg(val),
                             _ => unimplemented!("un op Neg for {:?}", layout.ty),
                         },
                     };
-                    lval.write_cvalue(fx, CValue::by_val(res, layout));
+                    lval.write_cvalue(fx, res);
                 }
                 Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), operand, ty) => {
                     let layout = fx.layout_of(ty);
                     match fx
                         .monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx))
-                        .sty
+                        .kind
                     {
                         ty::FnDef(def_id, substs) => {
                             let func_ref = fx.get_function_ref(
@@ -407,11 +364,19 @@ fn trans_stmt<'a, 'tcx: 'a>(
                 Rvalue::Cast(CastKind::Misc, operand, to_ty) => {
                     let operand = trans_operand(fx, operand);
                     let from_ty = operand.layout().ty;
-
-                    fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx>) -> bool {
-                        ty
-                            .builtin_deref(true)
-                            .map(|ty::TypeAndMut {ty: pointee_ty, mutbl: _ }| fx.layout_of(pointee_ty).is_unsized())
+                    let to_ty = fx.monomorphize(to_ty);
+
+                    fn is_fat_ptr<'tcx>(
+                        fx: &FunctionCx<'_, 'tcx, impl Backend>,
+                        ty: Ty<'tcx>,
+                    ) -> bool {
+                        ty.builtin_deref(true)
+                            .map(
+                                |ty::TypeAndMut {
+                                     ty: pointee_ty,
+                                     mutbl: _,
+                                 }| has_ptr_meta(fx.tcx, pointee_ty),
+                            )
                             .unwrap_or(false)
                     }
 
@@ -424,30 +389,37 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                             let (ptr, _extra) = operand.load_scalar_pair(fx);
                             lval.write_cvalue(fx, CValue::by_val(ptr, dest_layout))
                         }
-                    } else if let ty::Adt(adt_def, _substs) = from_ty.sty {
+                    } else if let ty::Adt(adt_def, _substs) = from_ty.kind {
                         // enum -> discriminant value
                         assert!(adt_def.is_enum());
-                        match to_ty.sty {
-                            ty::Uint(_) | ty::Int(_) => {},
+                        match to_ty.kind {
+                            ty::Uint(_) | ty::Int(_) => {}
                             _ => unreachable!("cast adt {} -> {}", from_ty, to_ty),
                         }
 
-                        // FIXME avoid forcing to stack
-                        let place =
-                            CPlace::for_addr(operand.force_stack(fx), operand.layout());
-                        let discr = trans_get_discriminant(fx, place, fx.layout_of(to_ty));
+                        let discr = crate::discriminant::codegen_get_discriminant(
+                            fx,
+                            operand,
+                            fx.layout_of(to_ty),
+                        );
                         lval.write_cvalue(fx, discr);
                     } else {
                         let to_clif_ty = fx.clif_type(to_ty).unwrap();
                         let from = operand.load_scalar(fx);
 
-                        let res = clif_int_or_float_cast(fx, from, type_sign(from_ty), to_clif_ty, type_sign(to_ty));
+                        let res = clif_int_or_float_cast(
+                            fx,
+                            from,
+                            type_sign(from_ty),
+                            to_clif_ty,
+                            type_sign(to_ty),
+                        );
                         lval.write_cvalue(fx, CValue::by_val(res, dest_layout));
                     }
                 }
                 Rvalue::Cast(CastKind::Pointer(PointerCast::ClosureFnPointer(_)), operand, _ty) => {
                     let operand = trans_operand(fx, operand);
-                    match operand.layout().ty.sty {
+                    match operand.layout().ty.kind {
                         ty::Closure(def_id, substs) => {
                             let instance = Instance::resolve_closure(
                                 fx.tcx,
@@ -459,9 +431,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
                             lval.write_cvalue(fx, CValue::by_val(func_addr, lval.layout()));
                         }
-                        _ => {
-                            bug!("{} cannot be cast to a fn ptr", operand.layout().ty)
-                        }
+                        _ => bug!("{} cannot be cast to a fn ptr", operand.layout().ty),
                     }
                 }
                 Rvalue::Cast(CastKind::Pointer(PointerCast::Unsize), operand, _ty) => {
@@ -470,7 +440,9 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                 }
                 Rvalue::Discriminant(place) => {
                     let place = trans_place(fx, place);
-                    let discr = trans_get_discriminant(fx, place, dest_layout);
+                    let value = place.to_cvalue(fx);
+                    let discr =
+                        crate::discriminant::codegen_get_discriminant(fx, value, dest_layout);
                     lval.write_cvalue(fx, discr);
                 }
                 Rvalue::Repeat(operand, times) => {
@@ -532,7 +504,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                             to.write_cvalue(fx, operand);
                         }
                     }
-                    _ => unimpl!("shouldn't exist at trans {:?}", rval),
+                    _ => unreachable!("shouldn't exist at trans {:?}", to_place_and_rval.1),
                 },
             }
         }
@@ -545,24 +517,36 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
 
         StatementKind::InlineAsm(asm) => {
             use syntax::ast::Name;
-            let InlineAsm { asm, outputs: _, inputs: _ } = &**asm;
+            let InlineAsm {
+                asm,
+                outputs: _,
+                inputs: _,
+            } = &**asm;
             let rustc::hir::InlineAsm {
                 asm: asm_code, // Name
-                outputs, // Vec<Name>
-                inputs, // Vec<Name>
-                clobbers, // Vec<Name>
-                volatile, // bool
-                alignstack, // bool
-                dialect: _, // syntax::ast::AsmDialect
+                outputs,       // Vec<Name>
+                inputs,        // Vec<Name>
+                clobbers,      // Vec<Name>
+                volatile,      // bool
+                alignstack,    // bool
+                dialect: _,    // syntax::ast::AsmDialect
                 asm_str_style: _,
-                ctxt: _,
             } = asm;
             match &*asm_code.as_str() {
+                "" => {
+                    assert_eq!(inputs, &[Name::intern("r")]);
+                    assert!(outputs.is_empty(), "{:?}", outputs);
+
+                    // Black box
+                }
                 "cpuid" | "cpuid\n" => {
                     assert_eq!(inputs, &[Name::intern("{eax}"), Name::intern("{ecx}")]);
 
                     assert_eq!(outputs.len(), 4);
-                    for (i, c) in (&["={eax}", "={ebx}", "={ecx}", "={edx}"]).iter().enumerate() {
+                    for (i, c) in (&["={eax}", "={ebx}", "={ecx}", "={edx}"])
+                        .iter()
+                        .enumerate()
+                    {
                         assert_eq!(&outputs[i].constraint.as_str(), c);
                         assert!(!outputs[i].is_rw);
                         assert!(!outputs[i].is_indirect);
@@ -573,7 +557,10 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                     assert!(!volatile);
                     assert!(!alignstack);
 
-                    crate::trap::trap_unimplemented(fx, "__cpuid_count arch intrinsic is not supported");
+                    crate::trap::trap_unimplemented(
+                        fx,
+                        "__cpuid_count arch intrinsic is not supported",
+                    );
                 }
                 "xgetbv" => {
                     assert_eq!(inputs, &[Name::intern("{ecx}")]);
@@ -592,7 +579,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
 
                     crate::trap::trap_unimplemented(fx, "_xgetbv arch intrinsic is not supported");
                 }
-                _ if fx.tcx.symbol_name(fx.instance).as_str() == "__rust_probestack" => {
+                _ if fx.tcx.symbol_name(fx.instance).name.as_str() == "__rust_probestack" => {
                     crate::trap::trap_unimplemented(fx, "__rust_probestack is not supported");
                 }
                 _ => unimpl!("Inline assembly is not supported"),
@@ -601,11 +588,11 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
     }
 }
 
-fn codegen_array_len<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+fn codegen_array_len<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     place: CPlace<'tcx>,
 ) -> Value {
-    match place.layout().ty.sty {
+    match place.layout().ty.kind {
         ty::Array(_elem_ty, len) => {
             let len = crate::constant::force_eval_const(fx, len)
                 .eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64;
@@ -619,175 +606,91 @@ fn codegen_array_len<'a, 'tcx: 'a>(
     }
 }
 
-pub fn trans_get_discriminant<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    place: CPlace<'tcx>,
-    dest_layout: TyLayout<'tcx>,
-) -> CValue<'tcx> {
-    let layout = place.layout();
-
-    if layout.abi == layout::Abi::Uninhabited {
-        return trap_unreachable_ret_value(fx, dest_layout, "[panic] Tried to get discriminant for uninhabited type.");
-    }
-
-    let (discr_scalar, discr_index, discr_kind) = match &layout.variants {
-        layout::Variants::Single { index } => {
-            let discr_val = layout
-                .ty
-                .ty_adt_def()
-                .map_or(u128::from(index.as_u32()), |def| {
-                    def.discriminant_for_variant(fx.tcx, *index).val
-                });
-            return CValue::const_val(fx, dest_layout.ty, discr_val);
-        }
-        layout::Variants::Multiple { discr, discr_index, discr_kind, variants: _ } => {
-            (discr, *discr_index, discr_kind)
-        }
-    };
-
-    let discr = place.place_field(fx, mir::Field::new(discr_index)).to_cvalue(fx);
-    let discr_ty = discr.layout().ty;
-    let lldiscr = discr.load_scalar(fx);
-    match discr_kind {
-        layout::DiscriminantKind::Tag => {
-            let signed = match discr_scalar.value {
-                layout::Int(_, signed) => signed,
-                _ => false,
-            };
-            let val = clif_intcast(fx, lldiscr, fx.clif_type(dest_layout.ty).unwrap(), signed);
-            return CValue::by_val(val, dest_layout);
-        }
-        layout::DiscriminantKind::Niche {
-            dataful_variant,
-            ref niche_variants,
-            niche_start,
-        } => {
-            let niche_llty = fx.clif_type(discr_ty).unwrap();
-            let dest_clif_ty = fx.clif_type(dest_layout.ty).unwrap();
-            if niche_variants.start() == niche_variants.end() {
-                let b = fx
-                    .bcx
-                    .ins()
-                    .icmp_imm(IntCC::Equal, lldiscr, *niche_start as u64 as i64);
-                let if_true = fx
-                    .bcx
-                    .ins()
-                    .iconst(dest_clif_ty, niche_variants.start().as_u32() as i64);
-                let if_false = fx
-                    .bcx
-                    .ins()
-                    .iconst(dest_clif_ty, dataful_variant.as_u32() as i64);
-                let val = fx.bcx.ins().select(b, if_true, if_false);
-                return CValue::by_val(val, dest_layout);
-            } else {
-                // Rebase from niche values to discriminant values.
-                let delta = niche_start.wrapping_sub(niche_variants.start().as_u32() as u128);
-                let delta = fx.bcx.ins().iconst(niche_llty, delta as u64 as i64);
-                let lldiscr = fx.bcx.ins().isub(lldiscr, delta);
-                let b = fx.bcx.ins().icmp_imm(
-                    IntCC::UnsignedLessThanOrEqual,
-                    lldiscr,
-                    niche_variants.end().as_u32() as i64,
-                );
-                let if_true =
-                    clif_intcast(fx, lldiscr, fx.clif_type(dest_layout.ty).unwrap(), false);
-                let if_false = fx
-                    .bcx
-                    .ins()
-                    .iconst(dest_clif_ty, dataful_variant.as_u32() as i64);
-                let val = fx.bcx.ins().select(b, if_true, if_false);
-                return CValue::by_val(val, dest_layout);
-            }
-        }
-    }
-}
-
-pub fn trans_place<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+pub fn trans_place<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     place: &Place<'tcx>,
 ) -> CPlace<'tcx> {
-    let base = match &place.base {
+    let mut cplace = match &place.base {
         PlaceBase::Local(local) => fx.get_local_place(*local),
         PlaceBase::Static(static_) => match static_.kind {
-            StaticKind::Static(def_id) => {
-                crate::constant::codegen_static_ref(fx, def_id, static_.ty)
+            StaticKind::Static => {
+                crate::constant::codegen_static_ref(fx, static_.def_id, static_.ty)
             }
-            StaticKind::Promoted(promoted) => {
-                crate::constant::trans_promoted(fx, promoted, static_.ty)
+            StaticKind::Promoted(promoted, substs) => {
+                let instance = Instance::new(static_.def_id, fx.monomorphize(&substs));
+                crate::constant::trans_promoted(fx, instance, promoted, static_.ty)
             }
-        }
-    };
-
-    trans_place_projection(fx, base, &place.projection)
-}
-
-pub fn trans_place_projection<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    base: CPlace<'tcx>,
-    projection: &Option<Box<Projection<'tcx>>>,
-) -> CPlace<'tcx> {
-    let projection = if let Some(projection) = projection {
-        projection
-    } else {
-        return base;
+        },
     };
 
-    let base = trans_place_projection(fx, base, &projection.base);
-
-    match projection.elem {
-        ProjectionElem::Deref => base.place_deref(fx),
-        ProjectionElem::Field(field, _ty) => base.place_field(fx, field),
-        ProjectionElem::Index(local) => {
-            let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
-            base.place_index(fx, index)
-        }
-        ProjectionElem::ConstantIndex {
-            offset,
-            min_length: _,
-            from_end,
-        } => {
-            let index = if !from_end {
-                fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
-            } else {
-                let len = codegen_array_len(fx, base);
-                fx.bcx.ins().iadd_imm(len, -(offset as i64))
-            };
-            base.place_index(fx, index)
-        }
-        ProjectionElem::Subslice { from, to } => {
-            // These indices are generated by slice patterns.
-            // slice[from:-to] in Python terms.
-
-            match base.layout().ty.sty {
-                ty::Array(elem_ty, len) => {
-                    let elem_layout = fx.layout_of(elem_ty);
-                    let ptr = base.to_addr(fx);
-                    let len = crate::constant::force_eval_const(fx, len)
-                        .eval_usize(fx.tcx, ParamEnv::reveal_all());
-                    CPlace::for_addr(
-                        fx.bcx.ins().iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
-                        fx.layout_of(fx.tcx.mk_array(elem_ty, len - from as u64 - to as u64)),
-                    )
-                }
-                ty::Slice(elem_ty) => {
-                    let elem_layout = fx.layout_of(elem_ty);
-                    let (ptr, len) = base.to_addr_maybe_unsized(fx);
-                    let len = len.unwrap();
-                    CPlace::for_addr_with_extra(
-                        fx.bcx.ins().iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
-                        fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64)),
-                        base.layout(),
-                    )
+    for elem in &*place.projection {
+        match *elem {
+            PlaceElem::Deref => {
+                cplace = cplace.place_deref(fx);
+            }
+            PlaceElem::Field(field, _ty) => {
+                cplace = cplace.place_field(fx, field);
+            }
+            PlaceElem::Index(local) => {
+                let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
+                cplace = cplace.place_index(fx, index);
+            }
+            PlaceElem::ConstantIndex {
+                offset,
+                min_length: _,
+                from_end,
+            } => {
+                let index = if !from_end {
+                    fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
+                } else {
+                    let len = codegen_array_len(fx, cplace);
+                    fx.bcx.ins().iadd_imm(len, -(offset as i64))
+                };
+                cplace = cplace.place_index(fx, index);
+            }
+            PlaceElem::Subslice { from, to } => {
+                // These indices are generated by slice patterns.
+                // slice[from:-to] in Python terms.
+
+                match cplace.layout().ty.kind {
+                    ty::Array(elem_ty, len) => {
+                        let elem_layout = fx.layout_of(elem_ty);
+                        let ptr = cplace.to_addr(fx);
+                        let len = crate::constant::force_eval_const(fx, len)
+                            .eval_usize(fx.tcx, ParamEnv::reveal_all());
+                        cplace = CPlace::for_addr(
+                            fx.bcx
+                                .ins()
+                                .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
+                            fx.layout_of(fx.tcx.mk_array(elem_ty, len - from as u64 - to as u64)),
+                        );
+                    }
+                    ty::Slice(elem_ty) => {
+                        let elem_layout = fx.layout_of(elem_ty);
+                        let (ptr, len) = cplace.to_addr_maybe_unsized(fx);
+                        let len = len.unwrap();
+                        cplace = CPlace::for_addr_with_extra(
+                            fx.bcx
+                                .ins()
+                                .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
+                            fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64)),
+                            cplace.layout(),
+                        );
+                    }
+                    _ => unreachable!(),
                 }
-                _ => unreachable!(),
+            }
+            PlaceElem::Downcast(_adt_def, variant) => {
+                cplace = cplace.downcast_variant(fx, variant);
             }
         }
-        ProjectionElem::Downcast(_adt_def, variant) => base.downcast_variant(fx, variant),
     }
+
+    cplace
 }
 
-pub fn trans_operand<'a, 'tcx>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+pub fn trans_operand<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     operand: &Operand<'tcx>,
 ) -> CValue<'tcx> {
     match operand {