]> 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 b36e673854efd51b68d21adf87ec6e595d2c9ab8..007ff5390de5d0a64d1bbce41aca53d52ae6aa37 100644 (file)
-use crate::prelude::*;
-
-struct PrintOnPanic<F: Fn() -> String>(F);
-impl<F: Fn() -> String> Drop for PrintOnPanic<F> {
-    fn drop(&mut self) {
-        if ::std::thread::panicking() {
-            println!("{}", (self.0)());
-        }
-    }
-}
-
-pub fn trans_mono_item<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
-    cx: &mut crate::CodegenCx<'a, 'clif, 'tcx, B>,
-    mono_item: MonoItem<'tcx>,
-    linkage: Linkage,
-) {
-    let tcx = cx.tcx;
-    match mono_item {
-        MonoItem::Fn(inst) => {
-            let _inst_guard =
-                PrintOnPanic(|| format!("{:?} {}", inst, tcx.symbol_name(inst).as_str()));
-            debug_assert!(!inst.substs.needs_infer());
-            let _mir_guard = PrintOnPanic(|| {
-                match inst.def {
-                    InstanceDef::Item(_)
-                    | InstanceDef::DropGlue(_, _)
-                    | InstanceDef::Virtual(_, _)
-                        if inst.def_id().krate == LOCAL_CRATE =>
-                    {
-                        let mut mir = ::std::io::Cursor::new(Vec::new());
-                        crate::rustc_mir::util::write_mir_pretty(
-                            tcx,
-                            Some(inst.def_id()),
-                            &mut mir,
-                        )
-                        .unwrap();
-                        String::from_utf8(mir.into_inner()).unwrap()
-                    }
-                    _ => {
-                        // FIXME fix write_mir_pretty for these instances
-                        format!("{:#?}", tcx.instance_mir(inst.def))
-                    }
-                }
-            });
+use rustc::ty::adjustment::PointerCast;
 
-            trans_fn(cx, inst, linkage);
-        }
-        MonoItem::Static(def_id) => {
-            crate::constant::codegen_static(&mut cx.ccx, def_id);
-        }
-        MonoItem::GlobalAsm(node_id) => tcx
-            .sess
-            .fatal(&format!("Unimplemented global asm mono item {:?}", node_id)),
-    }
-}
+use crate::prelude::*;
 
-fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
-    cx: &mut crate::CodegenCx<'a, 'clif, 'tcx, B>,
+pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
+    cx: &mut crate::CodegenCx<'clif, 'tcx, B>,
     instance: Instance<'tcx>,
     linkage: Linkage,
 ) {
     let tcx = cx.tcx;
 
-    // Step 1. Get mir
     let mir = tcx.instance_mir(instance.def);
 
-    // Step 2. Check fn sig for u128 and i128 and replace those functions with a trap.
-    {
-        // FIXME implement u128 and i128 support
-
-        // Step 2a. Check sig for u128 and i128
-        let fn_ty = instance.ty(tcx);
-        let fn_sig = crate::abi::ty_fn_sig(tcx, fn_ty);
-
-        struct UI128Visitor<'a, 'tcx: 'a>(TyCtxt<'a, 'tcx, 'tcx>, bool);
-
-        impl<'a, 'tcx: 'a> rustc::ty::fold::TypeVisitor<'tcx> for UI128Visitor<'a, 'tcx> {
-            fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
-                if t.sty == self.0.types.u128.sty || t.sty == self.0.types.i128.sty {
-                    self.1 = true;
-                    return false; // stop visiting
-                }
-
-                t.super_visit_with(self)
-            }
-        }
-
-        let mut visitor = UI128Visitor(tcx, false);
-        fn_sig.visit_with(&mut visitor);
-
-        // Step 2b. If found replace function with a trap.
-        if visitor.1 {
-            tcx.sess.warn("u128 and i128 are not yet supported. \
-            Functions using these as args will be replaced with a trap.");
-
-            // Step 2b1. Declare function with fake signature
-            let sig = Signature {
-                params: vec![AbiParam::new(types::INVALID)],
-                returns: vec![],
-                call_conv: CallConv::Fast,
-            };
-            let name = tcx.symbol_name(instance).as_str();
-            let func_id = cx.module.declare_function(&*name, linkage, &sig).unwrap();
-
-            // Step 2b2. Create trapping function
-            let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
-            let mut func_ctx = FunctionBuilderContext::new();
-            let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
-            let start_ebb = bcx.create_ebb();
-            bcx.append_ebb_params_for_function_params(start_ebb);
-            bcx.switch_to_block(start_ebb);
-            crate::trap::trap_unreachable(&mut bcx);
-            bcx.seal_all_blocks();
-            bcx.finalize();
-
-            // Step 2b3. Define function
-            cx.caches.context.func = func;
-            cx.module
-                .define_function(func_id, &mut cx.caches.context)
-                .unwrap();
-            cx.caches.context.clear();
-            return;
-        }
-    }
-
-    // Step 3. Declare function
+    // Declare function
     let (name, sig) = get_function_name_and_sig(tcx, instance, false);
     let func_id = cx.module.declare_function(&name, linkage, &sig).unwrap();
     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));
 
-    // Step 4. Make FunctionBuilder
+    // Make FunctionBuilder
     let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
     let mut func_ctx = FunctionBuilderContext::new();
     let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
 
-    // Step 5. Predefine ebb's
+    // Predefine ebb's
     let start_ebb = bcx.create_ebb();
     let mut ebb_map: HashMap<BasicBlock, Ebb> = HashMap::new();
     for (bb, _bb_data) in mir.basic_blocks().iter_enumerated() {
         ebb_map.insert(bb, bcx.create_ebb());
     }
 
-    // Step 6. Make FunctionCx
+    // Make FunctionCx
     let pointer_type = cx.module.target_config().pointer_type();
     let clif_comments = crate::pretty_clif::CommentWriter::new(tcx, instance);
 
@@ -160,43 +48,56 @@ fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
         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(),
     };
 
-    // Step 7. Codegen function
-    with_unimpl_span(fx.mir.span, || {
-        crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
-        codegen_fn_content(&mut fx);
-    });
-    let source_info_set = fx.source_info_set.clone();
+    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;
+    let clif_comments = fx.clif_comments;
+    let source_info_set = fx.source_info_set;
 
-    // Step 8. Write function to file for debugging
     #[cfg(debug_assertions)]
-    fx.write_clif_file();
+    crate::pretty_clif::write_clif_file(cx.tcx, "unopt", instance, &func, &clif_comments, None);
+
+    // Verify function
+    verify_func(tcx, &clif_comments, &func);
 
-    // Step 9. Verify function
-    verify_func(tcx, fx.clif_comments, &func);
+    // Define function
+    let context = &mut cx.caches.context;
+    context.func = func;
+    cx.module.define_function(func_id, context).unwrap();
 
-    // Step 10. Define function
-    cx.caches.context.func = func;
-    cx.module
-        .define_function(func_id, &mut cx.caches.context)
-        .unwrap();
+    let value_ranges = context
+        .build_value_labels_ranges(cx.module.isa())
+        .expect("value location ranges");
 
-    // Step 11. Define debuginfo for function
-    let context = &cx.caches.context;
+    // 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),
+    );
+
+    // Define debuginfo for function
     let isa = cx.module.isa();
     debug_context
         .as_mut()
         .map(|x| x.define(tcx, context, isa, &source_info_set));
 
-    // Step 12. Clear context to make it usable for the next function
-    cx.caches.context.clear();
+    // Clear context to make it usable for the next function
+    context.clear();
 }
 
-fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Function) {
+fn verify_func(tcx: TyCtxt, writer: &crate::pretty_clif::CommentWriter, func: &Function) {
     let flags = settings::Flags::new(settings::builder());
     match ::cranelift::codegen::verify_function(&func, &flags) {
         Ok(_) => {}
@@ -205,7 +106,7 @@ fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Fu
             let pretty_error = ::cranelift::codegen::print_errors::pretty_verifier_error(
                 &func,
                 None,
-                Some(Box::new(&writer)),
+                Some(Box::new(writer)),
                 err,
             );
             tcx.sess
@@ -214,7 +115,7 @@ fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Fu
     }
 }
 
-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
@@ -255,10 +156,17 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
             TerminatorKind::Assert {
                 cond,
                 expected,
-                msg: _,
+                msg,
                 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);
@@ -268,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(&mut fx.bcx);
+                trap_panic(
+                    fx,
+                    format!(
+                        "[panic] Assert {:?} at {:?} failed.",
+                        msg,
+                        bb_data.terminator().source_info.span
+                    ),
+                );
             }
 
             TerminatorKind::SwitchInt {
@@ -293,10 +208,19 @@ 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.");
             }
-            TerminatorKind::Resume | TerminatorKind::Abort | TerminatorKind::Unreachable => {
-                trap_unreachable(&mut fx.bcx);
+            TerminatorKind::Unreachable => {
+                trap_unreachable(fx, "[corruption] Hit unreachable code.");
             }
             TerminatorKind::Yield { .. }
             | TerminatorKind::FalseEdges { .. }
@@ -310,42 +234,8 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 target,
                 unwind: _,
             } => {
-                let ty = location.ty(fx.mir, fx.tcx).to_ty(fx.tcx);
-                let ty = fx.monomorphize(&ty);
-                let drop_fn = crate::rustc_mir::monomorphize::resolve_drop_in_place(fx.tcx, ty);
-
-                if let ty::InstanceDef::DropGlue(_, None) = drop_fn.def {
-                    // we don't actually need to drop anything
-                } else {
-                    let drop_place = trans_place(fx, location);
-                    let drop_fn_ty = drop_fn.ty(fx.tcx);
-                    match ty.sty {
-                        ty::Dynamic(..) => {
-                            crate::abi::codegen_drop(fx, drop_place, drop_fn_ty);
-                        }
-                        _ => {
-                            let arg_place = CPlace::new_stack_slot(
-                                fx,
-                                fx.tcx.mk_ref(
-                                    &ty::RegionKind::ReErased,
-                                    TypeAndMut {
-                                        ty,
-                                        mutbl: crate::rustc::hir::Mutability::MutMutable,
-                                    },
-                                ),
-                            );
-                            drop_place.write_place_ref(fx, arg_place);
-                            let arg_value = arg_place.to_cvalue(fx);
-                            crate::abi::codegen_call_inner(
-                                fx,
-                                None,
-                                drop_fn_ty,
-                                vec![arg_value],
-                                None,
-                            );
-                        }
-                    }
-                }
+                let drop_place = trans_place(fx, location);
+                crate::abi::codegen_drop(fx, drop_place);
 
                 let target_ebb = fx.get_ebb(*target);
                 fx.bcx.ins().jump(target_ebb, &[]);
@@ -357,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>,
 ) {
@@ -381,52 +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::Tagged { .. } => {
-                    let ptr = place.place_field(fx, mir::Field::new(0));
-                    let to = layout
-                        .ty
-                        .ty_adt_def()
-                        .unwrap()
-                        .discriminant_for_variant(fx.tcx, *variant_index)
-                        .val;
-                    let discr = CValue::const_val(fx, ptr.layout().ty, to as u64 as i64);
-                    ptr.write_cvalue(fx, discr);
-                }
-                layout::Variants::NicheFilling {
-                    dataful_variant,
-                    ref niche_variants,
-                    niche_start,
-                    ..
-                } => {
-                    if *variant_index != dataful_variant {
-                        let niche = place.place_field(fx, mir::Field::new(0));
-                        //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 as u64 as i64)
-                        };
-                        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);
@@ -436,40 +286,25 @@ 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 => trans_bool_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::Uint(_) => {
-                            trans_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, false)
-                        }
-                        ty::Int(_) => {
-                            trans_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, true)
-                        }
-                        ty::Float(_) => trans_float_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::Char => trans_char_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::RawPtr(..) => trans_ptr_binop(fx, *bin_op, lhs, rhs, lval.layout().ty),
-                        ty::FnPtr(..) => 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 res = match ty.sty {
-                        ty::Uint(_) => {
-                            trans_checked_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, false)
-                        }
-                        ty::Int(_) => {
-                            trans_checked_int_binop(fx, *bin_op, lhs, rhs, lval.layout().ty, true)
-                        }
-                        _ => unimplemented!("checked binop {:?} for {:?}", bin_op, ty),
+                    let res = if !fx.tcx.sess.overflow_checks() {
+                        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.write_cvalue(fx, res);
                 }
                 Rvalue::UnaryOp(un_op, operand) => {
@@ -478,33 +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(_) => {
+                                    CValue::by_val(fx.bcx.ins().bnot(val), layout)
                                 }
-                                ty::Uint(_) | ty::Int(_) => fx.bcx.ins().bnot(val),
                                 _ => 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();
-                                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::ByVal(res, layout));
+                    lval.write_cvalue(fx, res);
                 }
-                Rvalue::Cast(CastKind::ReifyFnPointer, operand, ty) => {
+                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(
@@ -512,13 +350,13 @@ fn trans_stmt<'a, 'tcx: 'a>(
                                     .unwrap(),
                             );
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
-                            lval.write_cvalue(fx, CValue::ByVal(func_addr, layout));
+                            lval.write_cvalue(fx, CValue::by_val(func_addr, layout));
                         }
                         _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", ty),
                     }
                 }
-                Rvalue::Cast(CastKind::UnsafeFnPointer, operand, ty)
-                | Rvalue::Cast(CastKind::MutToConstPointer, operand, ty) => {
+                Rvalue::Cast(CastKind::Pointer(PointerCast::UnsafeFnPointer), operand, ty)
+                | Rvalue::Cast(CastKind::Pointer(PointerCast::MutToConstPointer), operand, ty) => {
                     let operand = trans_operand(fx, operand);
                     let layout = fx.layout_of(ty);
                     lval.write_cvalue(fx, operand.unchecked_cast_to(layout));
@@ -526,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)
                     }
 
@@ -541,84 +387,41 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                         } else {
                             // fat-ptr -> thin-ptr
                             let (ptr, _extra) = operand.load_scalar_pair(fx);
-                            lval.write_cvalue(fx, CValue::ByVal(ptr, dest_layout))
+                            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::Addr(operand.force_stack(fx), None, 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 from_clif_ty = fx.clif_type(from_ty).unwrap();
                         let to_clif_ty = fx.clif_type(to_ty).unwrap();
                         let from = operand.load_scalar(fx);
 
-                        let signed = match from_ty.sty {
-                            ty::Ref(..) | ty::RawPtr(..) | ty::FnPtr(..) | ty::Char | ty::Uint(..) | ty::Bool => false,
-                            ty::Int(..) => true,
-                            ty::Float(..) => false, // `signed` is unused for floats
-                            _ => panic!("{}", from_ty),
-                        };
-
-                        let res = if from_clif_ty.is_int() && to_clif_ty.is_int() {
-                            // int-like -> int-like
-                            crate::common::clif_intcast(
-                                fx,
-                                from,
-                                to_clif_ty,
-                                signed,
-                            )
-                        } else if from_clif_ty.is_int() && to_clif_ty.is_float() {
-                            // int-like -> float
-                            // FIXME missing encoding for fcvt_from_sint.f32.i8
-                            let from = if from_clif_ty == types::I8 || from_clif_ty == types::I16 {
-                                fx.bcx.ins().uextend(types::I32, from)
-                            } else {
-                                from
-                            };
-                            if signed {
-                                fx.bcx.ins().fcvt_from_sint(to_clif_ty, from)
-                            } else {
-                                fx.bcx.ins().fcvt_from_uint(to_clif_ty, from)
-                            }
-                        } else if from_clif_ty.is_float() && to_clif_ty.is_int() {
-                            // float -> int-like
-                            let from = operand.load_scalar(fx);
-                            if signed {
-                                fx.bcx.ins().fcvt_to_sint_sat(to_clif_ty, from)
-                            } else {
-                                fx.bcx.ins().fcvt_to_uint_sat(to_clif_ty, from)
-                            }
-                        } else if from_clif_ty.is_float() && to_clif_ty.is_float() {
-                            // float -> float
-                            match (from_clif_ty, to_clif_ty) {
-                                (types::F32, types::F64) => {
-                                    fx.bcx.ins().fpromote(types::F64, from)
-                                }
-                                (types::F64, types::F32) => {
-                                    fx.bcx.ins().fdemote(types::F32, from)
-                                }
-                                _ => from,
-                            }
-                        } else {
-                            unimpl!("rval misc {:?} {:?}", from_ty, to_ty)
-                        };
-                        lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
+                        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::ClosureFnPointer, operand, _ty) => {
+                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 = rustc_mir::monomorphize::resolve_closure(
+                            let instance = Instance::resolve_closure(
                                 fx.tcx,
                                 def_id,
                                 substs,
@@ -626,20 +429,20 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                             );
                             let func_ref = fx.get_function_ref(instance);
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
-                            lval.write_cvalue(fx, CValue::ByVal(func_addr, lval.layout()));
-                        }
-                        _ => {
-                            bug!("{} cannot be cast to a fn ptr", operand.layout().ty)
+                            lval.write_cvalue(fx, CValue::by_val(func_addr, lval.layout()));
                         }
+                        _ => bug!("{} cannot be cast to a fn ptr", operand.layout().ty),
                     }
                 }
-                Rvalue::Cast(CastKind::Unsize, operand, _ty) => {
+                Rvalue::Cast(CastKind::Pointer(PointerCast::Unsize), operand, _ty) => {
                     let operand = trans_operand(fx, operand);
                     operand.unsize_value(fx, lval);
                 }
                 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) => {
@@ -654,7 +457,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                     let place = trans_place(fx, place);
                     let usize_layout = fx.layout_of(fx.tcx.types.usize);
                     let len = codegen_array_len(fx, place);
-                    lval.write_cvalue(fx, CValue::ByVal(len, usize_layout));
+                    lval.write_cvalue(fx, CValue::by_val(len, usize_layout));
                 }
                 Rvalue::NullaryOp(NullOp::Box, content_ty) => {
                     use rustc::middle::lang_items::ExchangeMallocFnLangItem;
@@ -681,7 +484,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                     let func_ref = fx.get_function_ref(instance);
                     let call = fx.bcx.ins().call(func_ref, &[llsize, llalign]);
                     let ptr = fx.bcx.inst_results(call)[0];
-                    lval.write_cvalue(fx, CValue::ByVal(ptr, box_layout));
+                    lval.write_cvalue(fx, CValue::by_val(ptr, box_layout));
                 }
                 Rvalue::NullaryOp(NullOp::SizeOf, ty) => {
                     assert!(lval
@@ -689,7 +492,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                         .ty
                         .is_sized(fx.tcx.at(DUMMY_SP), ParamEnv::reveal_all()));
                     let ty_size = fx.layout_of(ty).size.bytes();
-                    let val = CValue::const_val(fx, fx.tcx.types.usize, ty_size as i64);
+                    let val = CValue::const_val(fx, fx.tcx.types.usize, ty_size.into());
                     lval.write_cvalue(fx, val);
                 }
                 Rvalue::Aggregate(kind, operands) => match **kind {
@@ -701,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),
                 },
             }
         }
@@ -712,17 +515,87 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
         | StatementKind::Retag { .. }
         | StatementKind::AscribeUserType(..) => {}
 
-        StatementKind::InlineAsm { .. } => unimpl!("Inline assembly is not supported"),
+        StatementKind::InlineAsm(asm) => {
+            use syntax::ast::Name;
+            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
+                asm_str_style: _,
+            } = 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()
+                    {
+                        assert_eq!(&outputs[i].constraint.as_str(), c);
+                        assert!(!outputs[i].is_rw);
+                        assert!(!outputs[i].is_indirect);
+                    }
+
+                    assert_eq!(clobbers, &[Name::intern("rbx")]);
+
+                    assert!(!volatile);
+                    assert!(!alignstack);
+
+                    crate::trap::trap_unimplemented(
+                        fx,
+                        "__cpuid_count arch intrinsic is not supported",
+                    );
+                }
+                "xgetbv" => {
+                    assert_eq!(inputs, &[Name::intern("{ecx}")]);
+
+                    assert_eq!(outputs.len(), 2);
+                    for (i, c) in (&["={eax}", "={edx}"]).iter().enumerate() {
+                        assert_eq!(&outputs[i].constraint.as_str(), c);
+                        assert!(!outputs[i].is_rw);
+                        assert!(!outputs[i].is_indirect);
+                    }
+
+                    assert_eq!(clobbers, &[]);
+
+                    assert!(!volatile);
+                    assert!(!alignstack);
+
+                    crate::trap::trap_unimplemented(fx, "_xgetbv arch intrinsic is not supported");
+                }
+                _ 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"),
+            }
+        }
     }
 }
 
-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).unwrap_usize(fx.tcx) as i64;
+            let len = crate::constant::force_eval_const(fx, len)
+                .eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64;
             fx.bcx.ins().iconst(fx.pointer_type, len)
         }
         ty::Slice(_elem_ty) => place
@@ -733,470 +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);
-    }
-    match layout.variants {
-        layout::Variants::Single { index } => {
-            let discr_val = layout
-                .ty
-                .ty_adt_def()
-                .map_or(index.as_u32() as u128, |def| {
-                    def.discriminant_for_variant(fx.tcx, index).val
-                });
-            return CValue::const_val(fx, dest_layout.ty, discr_val as u64 as i64);
-        }
-        layout::Variants::Tagged { .. } | layout::Variants::NicheFilling { .. } => {}
-    }
-
-    let discr = place.place_field(fx, mir::Field::new(0)).to_cvalue(fx);
-    let discr_ty = discr.layout().ty;
-    let lldiscr = discr.load_scalar(fx);
-    match layout.variants {
-        layout::Variants::Single { .. } => bug!(),
-        layout::Variants::Tagged { ref tag, .. } => {
-            let signed = match tag.value {
-                layout::Int(_, signed) => signed,
-                _ => false,
-            };
-            let val = clif_intcast(fx, lldiscr, fx.clif_type(dest_layout.ty).unwrap(), signed);
-            return CValue::ByVal(val, dest_layout);
-        }
-        layout::Variants::NicheFilling {
-            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::ByVal(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::ByVal(val, dest_layout);
+pub fn trans_place<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
+    place: &Place<'tcx>,
+) -> CPlace<'tcx> {
+    let mut cplace = match &place.base {
+        PlaceBase::Local(local) => fx.get_local_place(*local),
+        PlaceBase::Static(static_) => match static_.kind {
+            StaticKind::Static => {
+                crate::constant::codegen_static_ref(fx, static_.def_id, static_.ty)
             }
-        }
-    }
-}
-
-macro_rules! binop_match {
-    (@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, bug) => {
-        bug!("binop {} on {} lhs: {:?} rhs: {:?}", stringify!($var), $bug_fmt, $lhs, $rhs)
-    };
-    (@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, icmp($cc:ident)) => {{
-        assert_eq!($fx.tcx.types.bool, $ret_ty);
-        let ret_layout = $fx.layout_of($ret_ty);
-
-        let b = $fx.bcx.ins().icmp(IntCC::$cc, $lhs, $rhs);
-        CValue::ByVal($fx.bcx.ins().bint(types::I8, b), ret_layout)
-    }};
-    (@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, fcmp($cc:ident)) => {{
-        assert_eq!($fx.tcx.types.bool, $ret_ty);
-        let ret_layout = $fx.layout_of($ret_ty);
-        let b = $fx.bcx.ins().fcmp(FloatCC::$cc, $lhs, $rhs);
-        CValue::ByVal($fx.bcx.ins().bint(types::I8, b), ret_layout)
-    }};
-    (@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, custom(|| $body:expr)) => {{
-        $body
-    }};
-    (@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, $name:ident) => {{
-        let ret_layout = $fx.layout_of($ret_ty);
-        CValue::ByVal($fx.bcx.ins().$name($lhs, $rhs), ret_layout)
-    }};
-    (
-        $fx:expr, $bin_op:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, $bug_fmt:expr;
-        $(
-            $var:ident ($sign:pat) $name:tt $( ( $($next:tt)* ) )? ;
-        )*
-    ) => {{
-        let lhs = $lhs.load_scalar($fx);
-        let rhs = $rhs.load_scalar($fx);
-        match ($bin_op, $signed) {
-            $(
-                (BinOp::$var, $sign) => binop_match!(@single $fx, $bug_fmt, $var, $signed, lhs, rhs, $ret_ty, $name $( ( $($next)* ) )?),
-            )*
-        }
-    }}
-}
-
-fn trans_bool_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    lhs: CValue<'tcx>,
-    rhs: CValue<'tcx>,
-    ty: Ty<'tcx>,
-) -> CValue<'tcx> {
-    let res = binop_match! {
-        fx, bin_op, false, lhs, rhs, ty, "bool";
-        Add (_) bug;
-        Sub (_) bug;
-        Mul (_) bug;
-        Div (_) bug;
-        Rem (_) bug;
-        BitXor (_) bxor;
-        BitAnd (_) band;
-        BitOr (_) bor;
-        Shl (_) bug;
-        Shr (_) bug;
-
-        Eq (_) icmp(Equal);
-        Lt (_) icmp(UnsignedLessThan);
-        Le (_) icmp(UnsignedLessThanOrEqual);
-        Ne (_) icmp(NotEqual);
-        Ge (_) icmp(UnsignedGreaterThanOrEqual);
-        Gt (_) icmp(UnsignedGreaterThan);
-
-        Offset (_) bug;
-    };
-
-    res
-}
-
-pub fn trans_int_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    lhs: CValue<'tcx>,
-    rhs: CValue<'tcx>,
-    out_ty: Ty<'tcx>,
-    signed: bool,
-) -> CValue<'tcx> {
-    if bin_op != BinOp::Shl && bin_op != BinOp::Shr {
-        assert_eq!(
-            lhs.layout().ty,
-            rhs.layout().ty,
-            "int binop requires lhs and rhs of same type"
-        );
-    }
-    binop_match! {
-        fx, bin_op, signed, lhs, rhs, out_ty, "int/uint";
-        Add (_) iadd;
-        Sub (_) isub;
-        Mul (_) imul;
-        Div (false) udiv;
-        Div (true) sdiv;
-        Rem (false) urem;
-        Rem (true) srem;
-        BitXor (_) bxor;
-        BitAnd (_) band;
-        BitOr (_) bor;
-        Shl (_) ishl;
-        Shr (false) ushr;
-        Shr (true) sshr;
-
-        Eq (_) icmp(Equal);
-        Lt (false) icmp(UnsignedLessThan);
-        Lt (true) icmp(SignedLessThan);
-        Le (false) icmp(UnsignedLessThanOrEqual);
-        Le (true) icmp(SignedLessThanOrEqual);
-        Ne (_) icmp(NotEqual);
-        Ge (false) icmp(UnsignedGreaterThanOrEqual);
-        Ge (true) icmp(SignedGreaterThanOrEqual);
-        Gt (false) icmp(UnsignedGreaterThan);
-        Gt (true) icmp(SignedGreaterThan);
-
-        Offset (_) bug;
-    }
-}
-
-pub fn trans_checked_int_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    in_lhs: CValue<'tcx>,
-    in_rhs: CValue<'tcx>,
-    out_ty: Ty<'tcx>,
-    signed: bool,
-) -> CValue<'tcx> {
-    if bin_op != BinOp::Shl && bin_op != BinOp::Shr {
-        assert_eq!(
-            in_lhs.layout().ty,
-            in_rhs.layout().ty,
-            "checked int binop requires lhs and rhs of same type"
-        );
-    }
-
-    let lhs = in_lhs.load_scalar(fx);
-    let rhs = in_rhs.load_scalar(fx);
-    let res = match bin_op {
-        BinOp::Add => fx.bcx.ins().iadd(lhs, rhs),
-        BinOp::Sub => fx.bcx.ins().isub(lhs, rhs),
-        BinOp::Mul => fx.bcx.ins().imul(lhs, rhs),
-        BinOp::Shl => fx.bcx.ins().ishl(lhs, rhs),
-        BinOp::Shr => {
-            if !signed {
-                fx.bcx.ins().ushr(lhs, rhs)
-            } else {
-                fx.bcx.ins().sshr(lhs, rhs)
+            StaticKind::Promoted(promoted, substs) => {
+                let instance = Instance::new(static_.def_id, fx.monomorphize(&substs));
+                crate::constant::trans_promoted(fx, instance, promoted, static_.ty)
             }
-        }
-        _ => bug!(
-            "binop {:?} on checked int/uint lhs: {:?} rhs: {:?}",
-            bin_op,
-            in_lhs,
-            in_rhs
-        ),
+        },
     };
 
-    // TODO: check for overflow
-    let has_overflow = fx.bcx.ins().iconst(types::I8, 0);
-
-    let out_place = CPlace::new_stack_slot(fx, out_ty);
-    let out_layout = out_place.layout();
-    out_place.write_cvalue(fx, CValue::ByValPair(res, has_overflow, out_layout));
-
-    out_place.to_cvalue(fx)
-}
-
-fn trans_float_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    lhs: CValue<'tcx>,
-    rhs: CValue<'tcx>,
-    ty: Ty<'tcx>,
-) -> CValue<'tcx> {
-    let res = binop_match! {
-        fx, bin_op, false, lhs, rhs, ty, "float";
-        Add (_) fadd;
-        Sub (_) fsub;
-        Mul (_) fmul;
-        Div (_) fdiv;
-        Rem (_) custom(|| {
-            assert_eq!(lhs.layout().ty, ty);
-            assert_eq!(rhs.layout().ty, ty);
-            match ty.sty {
-                ty::Float(FloatTy::F32) => fx.easy_call("fmodf", &[lhs, rhs], ty),
-                ty::Float(FloatTy::F64) => fx.easy_call("fmod", &[lhs, rhs], ty),
-                _ => bug!(),
+    for elem in &*place.projection {
+        match *elem {
+            PlaceElem::Deref => {
+                cplace = cplace.place_deref(fx);
             }
-        });
-        BitXor (_) bxor;
-        BitAnd (_) band;
-        BitOr (_) bor;
-        Shl (_) bug;
-        Shr (_) bug;
-
-        Eq (_) fcmp(Equal);
-        Lt (_) fcmp(LessThan);
-        Le (_) fcmp(LessThanOrEqual);
-        Ne (_) fcmp(NotEqual);
-        Ge (_) fcmp(GreaterThanOrEqual);
-        Gt (_) fcmp(GreaterThan);
-
-        Offset (_) bug;
-    };
-
-    res
-}
-
-fn trans_char_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    lhs: CValue<'tcx>,
-    rhs: CValue<'tcx>,
-    ty: Ty<'tcx>,
-) -> CValue<'tcx> {
-    let res = binop_match! {
-        fx, bin_op, false, lhs, rhs, ty, "char";
-        Add (_) bug;
-        Sub (_) bug;
-        Mul (_) bug;
-        Div (_) bug;
-        Rem (_) bug;
-        BitXor (_) bug;
-        BitAnd (_) bug;
-        BitOr (_) bug;
-        Shl (_) bug;
-        Shr (_) bug;
-
-        Eq (_) icmp(Equal);
-        Lt (_) icmp(UnsignedLessThan);
-        Le (_) icmp(UnsignedLessThanOrEqual);
-        Ne (_) icmp(NotEqual);
-        Ge (_) icmp(UnsignedGreaterThanOrEqual);
-        Gt (_) icmp(UnsignedGreaterThan);
-
-        Offset (_) bug;
-    };
-
-    res
-}
-
-fn trans_ptr_binop<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    bin_op: BinOp,
-    lhs: CValue<'tcx>,
-    rhs: CValue<'tcx>,
-    ret_ty: Ty<'tcx>,
-) -> CValue<'tcx> {
-    let not_fat = match lhs.layout().ty.sty {
-        ty::RawPtr(TypeAndMut { ty, mutbl: _ }) => {
-            ty.is_sized(fx.tcx.at(DUMMY_SP), ParamEnv::reveal_all())
-        }
-        ty::FnPtr(..) => true,
-        _ => bug!("trans_ptr_binop on non ptr"),
-    };
-    if not_fat {
-        if let BinOp::Offset = bin_op {
-            let (base, offset) = (lhs, rhs.load_scalar(fx));
-            let pointee_ty = base.layout().ty.builtin_deref(true).unwrap().ty;
-            let pointee_size = fx.layout_of(pointee_ty).size.bytes();
-            let ptr_diff = fx.bcx.ins().imul_imm(offset, pointee_size as i64);
-            let base_val = base.load_scalar(fx);
-            let res = fx.bcx.ins().iadd(base_val, ptr_diff);
-            return CValue::ByVal(res, base.layout());
-        }
-
-        binop_match! {
-            fx, bin_op, false, lhs, rhs, ret_ty, "ptr";
-            Add (_) bug;
-            Sub (_) bug;
-            Mul (_) bug;
-            Div (_) bug;
-            Rem (_) bug;
-            BitXor (_) bug;
-            BitAnd (_) bug;
-            BitOr (_) bug;
-            Shl (_) bug;
-            Shr (_) bug;
-
-            Eq (_) icmp(Equal);
-            Lt (_) icmp(UnsignedLessThan);
-            Le (_) icmp(UnsignedLessThanOrEqual);
-            Ne (_) icmp(NotEqual);
-            Ge (_) icmp(UnsignedGreaterThanOrEqual);
-            Gt (_) icmp(UnsignedGreaterThan);
-
-            Offset (_) bug; // Handled above
-        }
-    } else {
-        let (lhs_ptr, lhs_extra) = lhs.load_scalar_pair(fx);
-        let (rhs_ptr, rhs_extra) = rhs.load_scalar_pair(fx);
-        let res = match bin_op {
-            BinOp::Eq => {
-                let ptr_eq = fx.bcx.ins().icmp(IntCC::Equal, lhs_ptr, rhs_ptr);
-                let extra_eq = fx.bcx.ins().icmp(IntCC::Equal, lhs_extra, rhs_extra);
-                fx.bcx.ins().band(ptr_eq, extra_eq)
+            PlaceElem::Field(field, _ty) => {
+                cplace = cplace.place_field(fx, field);
             }
-            BinOp::Ne => {
-                let ptr_ne = fx.bcx.ins().icmp(IntCC::NotEqual, lhs_ptr, rhs_ptr);
-                let extra_ne = fx.bcx.ins().icmp(IntCC::NotEqual, lhs_extra, rhs_extra);
-                fx.bcx.ins().bor(ptr_ne, extra_ne)
+            PlaceElem::Index(local) => {
+                let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
+                cplace = cplace.place_index(fx, index);
             }
-            _ => unimplemented!(
-                "trans_ptr_binop({:?}, <fat ptr>, <fat ptr>) not implemented",
-                bin_op
-            ),
-        };
-
-        assert_eq!(fx.tcx.types.bool, ret_ty);
-        let ret_layout = fx.layout_of(ret_ty);
-        CValue::ByVal(fx.bcx.ins().bint(types::I8, res), ret_layout)
-    }
-}
-
-pub fn trans_place<'a, 'tcx: 'a>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    place: &Place<'tcx>,
-) -> CPlace<'tcx> {
-    match place {
-        Place::Base(base) => match base {
-            PlaceBase::Local(local) => fx.get_local_place(*local),
-            PlaceBase::Promoted(data) => crate::constant::trans_promoted(fx, data.0, data.1),
-            PlaceBase::Static(static_) => crate::constant::codegen_static_ref(fx, static_),
-        }
-        Place::Projection(projection) => {
-            let base = trans_place(fx, &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).unwrap_usize(fx.tcx);
-                            CPlace::Addr(
-                                fx.bcx.ins().iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
-                                None,
-                                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::Addr(
-                                fx.bcx.ins().iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
-                                Some(fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64))),
-                                base.layout(),
-                            )
-                        }
-                        _ => unreachable!(),
+            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!(),
                 }
-                ProjectionElem::Downcast(_adt_def, variant) => base.downcast_variant(fx, variant),
+            }
+            PlaceElem::Downcast(_adt_def, variant) => {
+                cplace = cplace.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 {