]> git.lizzy.rs Git - rust.git/blobdiff - src/base.rs
Use don't unroll loop in Rvalue::Repeat
[rust.git] / src / base.rs
index f8bd567234611eb69263b3b1b2e02da7f669350b..cae2115ab181b630f67b1e090df951313c953e0c 100644 (file)
@@ -1,9 +1,10 @@
-use rustc::ty::adjustment::PointerCast;
+use rustc_index::vec::IndexVec;
+use rustc_middle::ty::adjustment::PointerCast;
 
 use crate::prelude::*;
 
-pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
-    cx: &mut crate::CodegenCx<'clif, 'tcx, B>,
+pub(crate) fn trans_fn<'tcx, B: Backend + 'static>(
+    cx: &mut crate::CodegenCx<'tcx, B>,
     instance: Instance<'tcx>,
     linkage: Linkage,
 ) {
@@ -11,196 +12,195 @@ pub fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
 
     let mir = tcx.instance_mir(instance.def);
 
-    // Check fn sig for u128 and i128 and replace those functions with a trap.
-    {
-        // FIXME implement u128 and i128 support
-
-        // Check sig for u128 and i128
-        let fn_sig = tcx.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), &instance.fn_sig(tcx));
-
-        struct UI128Visitor<'tcx>(TyCtxt<'tcx>, bool);
-
-        impl<'tcx> rustc::ty::fold::TypeVisitor<'tcx> for UI128Visitor<'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);
-
-        //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.");
-
-            // 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();
-
-            // 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);
-
-            let mut fx = FunctionCx {
-                tcx,
-                module: cx.module,
-                pointer_type: pointer_ty(tcx),
-
-                instance,
-                mir,
-
-                bcx,
-                ebb_map: HashMap::new(),
-                local_map: HashMap::new(),
-
-                clif_comments: crate::pretty_clif::CommentWriter::new(tcx, instance),
-                constants: &mut cx.ccx,
-                caches: &mut cx.caches,
-                source_info_set: indexmap::IndexSet::new(),
-            };
-
-            crate::trap::trap_unreachable(&mut fx, "[unimplemented] Called function with u128 or i128 as argument.");
-            fx.bcx.seal_all_blocks();
-            fx.bcx.finalize();
-
-            // Define function
-            cx.caches.context.func = func;
-            cx.module
-                .define_function(func_id, &mut cx.caches.context)
-                .unwrap();
-            cx.caches.context.clear();
-            return;
-        }
-    }
-
     // Declare function
-    let (name, sig) = get_function_name_and_sig(tcx, instance, false);
+    let (name, sig) = get_function_name_and_sig(tcx, cx.module.isa().triple(), 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));
 
-    // Make FunctionBuilder
-    let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+    cx.cached_context.clear();
+
+    // Make the FunctionBuilder
     let mut func_ctx = FunctionBuilderContext::new();
+    let mut func = std::mem::replace(&mut cx.cached_context.func, Function::new());
+    func.name = ExternalName::user(0, func_id.as_u32());
+    func.signature = sig;
+    func.collect_debug_info();
+
     let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
 
-    // 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());
-    }
+    // Predefine blocks
+    let start_block = bcx.create_block();
+    let block_map: IndexVec<BasicBlock, Block> = (0..mir.basic_blocks().len())
+        .map(|_| bcx.create_block())
+        .collect();
 
     // Make FunctionCx
     let pointer_type = cx.module.target_config().pointer_type();
     let clif_comments = crate::pretty_clif::CommentWriter::new(tcx, instance);
 
     let mut fx = FunctionCx {
+        cx,
         tcx,
-        module: cx.module,
         pointer_type,
 
         instance,
         mir,
 
         bcx,
-        ebb_map,
-        local_map: HashMap::new(),
+        block_map,
+        local_map: FxHashMap::with_capacity_and_hasher(mir.local_decls.len(), Default::default()),
+        caller_location: None, // set by `codegen_fn_prelude`
+        cold_blocks: EntitySet::new(),
 
         clif_comments,
-        constants: &mut cx.ccx,
-        caches: &mut cx.caches,
         source_info_set: indexmap::IndexSet::new(),
+        next_ssa_var: 0,
+
+        inline_asm_index: 0,
     };
 
-    with_unimpl_span(fx.mir.span, || {
-        crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
-        codegen_fn_content(&mut fx);
+    let arg_uninhabited = fx.mir.args_iter().any(|arg| {
+        fx.layout_of(fx.monomorphize(&fx.mir.local_decls[arg].ty))
+            .abi
+            .is_uninhabited()
     });
 
+    if arg_uninhabited {
+        fx.bcx
+            .append_block_params_for_function_params(fx.block_map[START_BLOCK]);
+        fx.bcx.switch_to_block(fx.block_map[START_BLOCK]);
+        crate::trap::trap_unreachable(&mut fx, "function has uninhabited argument");
+    } else {
+        tcx.sess.time("codegen clif ir", || {
+            tcx.sess.time("codegen prelude", || {
+                crate::abi::codegen_fn_prelude(&mut fx, start_block)
+            });
+            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 mut clif_comments = fx.clif_comments;
     let source_info_set = fx.source_info_set;
+    let local_map = fx.local_map;
+    let cold_blocks = fx.cold_blocks;
+
+    // Store function in context
+    let context = &mut cx.cached_context;
+    context.func = func;
 
-    #[cfg(debug_assertions)]
-    crate::pretty_clif::write_clif_file(cx.tcx, "unopt", instance, &func, &clif_comments, None);
+    crate::pretty_clif::write_clif_file(tcx, "unopt", None, instance, &context, &clif_comments);
 
     // Verify function
-    verify_func(tcx, &clif_comments, &func);
+    verify_func(tcx, &clif_comments, &context.func);
+
+    // Perform rust specific optimizations
+    tcx.sess.time("optimize clif ir", || {
+        crate::optimize::optimize_function(
+            tcx,
+            instance,
+            context,
+            &cold_blocks,
+            &mut clif_comments,
+        );
+    });
 
-    // Define function
-    let context = &mut cx.caches.context;
-    context.func = func;
-    cx.module
-        .define_function(func_id, context)
-        .unwrap();
+    // If the return block is not reachable, then the SSA builder may have inserted an `iconst.i128`
+    // instruction, which doesn't have an encoding.
+    context.compute_cfg();
+    context.compute_domtree();
+    context.eliminate_unreachable_code(cx.module.isa()).unwrap();
+    context.dce(cx.module.isa()).unwrap();
 
-    let value_ranges = context.build_value_labels_ranges(cx.module.isa()).expect("value location ranges");
+    // Define function
+    let module = &mut cx.module;
+    tcx.sess.time("define function", || {
+        module
+            .define_function(
+                func_id,
+                context,
+                &mut cranelift_codegen::binemit::NullTrapSink {},
+            )
+            .unwrap()
+    });
 
     // 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(
+        tcx,
+        "opt",
+        Some(cx.module.isa()),
+        instance,
+        &context,
+        &clif_comments,
+    );
 
     // Define debuginfo for function
     let isa = cx.module.isa();
-    debug_context
-        .as_mut()
-        .map(|x| x.define(tcx, context, isa, &source_info_set));
+    let debug_context = &mut cx.debug_context;
+    let unwind_context = &mut cx.unwind_context;
+    tcx.sess.time("generate debug info", || {
+        if let Some(debug_context) = debug_context {
+            debug_context.define_function(
+                instance,
+                func_id,
+                &name,
+                isa,
+                context,
+                &source_info_set,
+                local_map,
+            );
+        }
+        unwind_context.add_function(func_id, &context, isa);
+    });
 
     // Clear context to make it usable for the next function
     context.clear();
 }
 
-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(_) => {}
-        Err(err) => {
-            tcx.sess.err(&format!("{:?}", err));
-            let pretty_error = ::cranelift::codegen::print_errors::pretty_verifier_error(
-                &func,
-                None,
-                Some(Box::new(writer)),
-                err,
-            );
-            tcx.sess
-                .fatal(&format!("cranelift verify error:\n{}", pretty_error));
+pub(crate) fn verify_func(
+    tcx: TyCtxt<'_>,
+    writer: &crate::pretty_clif::CommentWriter,
+    func: &Function,
+) {
+    tcx.sess.time("verify clif ir", || {
+        let flags = cranelift_codegen::settings::Flags::new(cranelift_codegen::settings::builder());
+        match cranelift_codegen::verify_function(&func, &flags) {
+            Ok(_) => {}
+            Err(err) => {
+                tcx.sess.err(&format!("{:?}", err));
+                let pretty_error = cranelift_codegen::print_errors::pretty_verifier_error(
+                    &func,
+                    None,
+                    Some(Box::new(writer)),
+                    err,
+                );
+                tcx.sess
+                    .fatal(&format!("cranelift verify error:\n{}", pretty_error));
+            }
         }
-    }
+    });
 }
 
-fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>) {
+fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
+    crate::constant::check_constants(fx);
+
     for (bb, bb_data) in fx.mir.basic_blocks().iter_enumerated() {
+        let block = fx.get_block(bb);
+        fx.bcx.switch_to_block(block);
+
         if bb_data.is_cleanup {
             // Unwinding after panicking is not supported
             continue;
-        }
 
-        let ebb = fx.get_ebb(bb);
-        fx.bcx.switch_to_block(ebb);
+            // FIXME once unwinding is supported uncomment next lines
+            // // Unwinding is unlikely to happen, so mark cleanup block's as cold.
+            // fx.cold_blocks.insert(block);
+        }
 
         fx.bcx.ins().nop();
         for stmt in &bb_data.statements {
             fx.set_debug_loc(stmt.source_info);
-            trans_stmt(fx, ebb, stmt);
+            trans_stmt(fx, block, stmt);
         }
 
         #[cfg(debug_assertions)]
@@ -211,7 +211,7 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 .kind
                 .fmt_head(&mut terminator_head)
                 .unwrap();
-            let inst = fx.bcx.func.layout.last_inst(ebb).unwrap();
+            let inst = fx.bcx.func.layout.last_inst(block).unwrap();
             fx.add_comment(inst, terminator_head);
         }
 
@@ -219,8 +219,25 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
 
         match &bb_data.terminator().kind {
             TerminatorKind::Goto { target } => {
-                let ebb = fx.get_ebb(*target);
-                fx.bcx.ins().jump(ebb, &[]);
+                if let TerminatorKind::Return = fx.mir[*target].terminator().kind {
+                    let mut can_immediately_return = true;
+                    for stmt in &fx.mir[*target].statements {
+                        if let StatementKind::StorageDead(_) = stmt.kind {
+                        } else {
+                            // FIXME Can sometimes happen, see rust-lang/rust#70531
+                            can_immediately_return = false;
+                            break;
+                        }
+                    }
+
+                    if can_immediately_return {
+                        crate::abi::codegen_return(fx);
+                        continue;
+                    }
+                }
+
+                let block = fx.get_block(*target);
+                fx.bcx.ins().jump(block, &[]);
             }
             TerminatorKind::Return => {
                 crate::abi::codegen_return(fx);
@@ -232,41 +249,159 @@ 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::AssertKind::OverflowNeg(_) = *msg {
+                        let target = fx.get_block(*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);
-                let target = fx.get_ebb(*target);
+
+                let target = fx.get_block(*target);
+                let failure = fx.bcx.create_block();
+                fx.cold_blocks.insert(failure);
+
                 if *expected {
-                    fx.bcx.ins().brnz(cond, target, &[]);
+                    fx.bcx.ins().brz(cond, failure, &[]);
                 } else {
-                    fx.bcx.ins().brz(cond, target, &[]);
+                    fx.bcx.ins().brnz(cond, failure, &[]);
+                };
+                fx.bcx.ins().jump(target, &[]);
+
+                fx.bcx.switch_to_block(failure);
+
+                let location = fx
+                    .get_caller_location(bb_data.terminator().source_info.span)
+                    .load_scalar(fx);
+
+                let args;
+                let lang_item = match msg {
+                    AssertKind::BoundsCheck { ref len, ref index } => {
+                        let len = trans_operand(fx, len).load_scalar(fx);
+                        let index = trans_operand(fx, index).load_scalar(fx);
+                        args = [index, len, location];
+                        rustc_hir::LangItem::PanicBoundsCheck
+                    }
+                    _ => {
+                        let msg_str = msg.description();
+                        let msg_ptr = fx.anonymous_str("assert", msg_str);
+                        let msg_len = fx
+                            .bcx
+                            .ins()
+                            .iconst(fx.pointer_type, i64::try_from(msg_str.len()).unwrap());
+                        args = [msg_ptr, msg_len, location];
+                        rustc_hir::LangItem::Panic
+                    }
                 };
-                trap_panic(fx, format!("[panic] Assert {:?} failed at {:?}.", msg, bb_data.terminator().source_info.span));
+
+                let def_id = fx.tcx.lang_items().require(lang_item).unwrap_or_else(|s| {
+                    fx.tcx
+                        .sess
+                        .span_fatal(bb_data.terminator().source_info.span, &s)
+                });
+
+                let instance = Instance::mono(fx.tcx, def_id).polymorphize(fx.tcx);
+                let symbol_name = fx.tcx.symbol_name(instance).name;
+
+                fx.lib_call(
+                    &*symbol_name,
+                    vec![fx.pointer_type, fx.pointer_type, fx.pointer_type],
+                    vec![],
+                    &args,
+                );
+
+                crate::trap::trap_unreachable(fx, "panic lang item returned");
             }
 
             TerminatorKind::SwitchInt {
                 discr,
-                switch_ty: _,
+                switch_ty,
                 values,
                 targets,
             } => {
                 let discr = trans_operand(fx, discr).load_scalar(fx);
-                let mut switch = ::cranelift::frontend::Switch::new();
-                for (i, value) in values.iter().enumerate() {
-                    let ebb = fx.get_ebb(targets[i]);
-                    switch.set_entry(*value as u64, ebb);
+
+                if switch_ty.kind() == fx.tcx.types.bool.kind() {
+                    assert_eq!(targets.len(), 2);
+                    let then_block = fx.get_block(targets[0]);
+                    let else_block = fx.get_block(targets[1]);
+                    let test_zero = match **values {
+                        [0] => true,
+                        [1] => false,
+                        _ => unreachable!("{:?}", values),
+                    };
+
+                    let discr = crate::optimize::peephole::maybe_unwrap_bint(&mut fx.bcx, discr);
+                    let (discr, is_inverted) =
+                        crate::optimize::peephole::maybe_unwrap_bool_not(&mut fx.bcx, discr);
+                    let test_zero = if is_inverted { !test_zero } else { test_zero };
+                    let discr = crate::optimize::peephole::maybe_unwrap_bint(&mut fx.bcx, discr);
+                    let discr =
+                        crate::optimize::peephole::make_branchable_value(&mut fx.bcx, discr);
+                    if test_zero {
+                        fx.bcx.ins().brz(discr, then_block, &[]);
+                        fx.bcx.ins().jump(else_block, &[]);
+                    } else {
+                        fx.bcx.ins().brnz(discr, then_block, &[]);
+                        fx.bcx.ins().jump(else_block, &[]);
+                    }
+                } else {
+                    let mut switch = ::cranelift_frontend::Switch::new();
+                    for (i, value) in values.iter().enumerate() {
+                        let block = fx.get_block(targets[i]);
+                        switch.set_entry(*value, block);
+                    }
+                    let otherwise_block = fx.get_block(targets[targets.len() - 1]);
+                    switch.emit(&mut fx.bcx, discr, otherwise_block);
                 }
-                let otherwise_ebb = fx.get_ebb(targets[targets.len() - 1]);
-                switch.emit(&mut fx.bcx, discr, otherwise_ebb);
             }
             TerminatorKind::Call {
                 func,
                 args,
                 destination,
+                fn_span,
                 cleanup: _,
                 from_hir_call: _,
             } => {
-                crate::abi::codegen_terminator_call(fx, func, args, destination);
+                fx.tcx.sess.time("codegen call", || {
+                    crate::abi::codegen_terminator_call(
+                        fx,
+                        *fn_span,
+                        block,
+                        func,
+                        args,
+                        *destination,
+                    )
+                });
+            }
+            TerminatorKind::InlineAsm {
+                template,
+                operands,
+                options,
+                destination,
+                line_spans: _,
+            } => {
+                crate::inline_asm::codegen_inline_asm(
+                    fx,
+                    bb_data.terminator().source_info.span,
+                    template,
+                    operands,
+                    *options,
+                );
+
+                match *destination {
+                    Some(destination) => {
+                        let destination_block = fx.get_block(destination);
+                        fx.bcx.ins().jump(destination_block, &[]);
+                    }
+                    None => {
+                        crate::trap::trap_unreachable(
+                            fx,
+                            "[corruption] Returned from noreturn inline asm",
+                        );
+                    }
+                }
             }
             TerminatorKind::Resume | TerminatorKind::Abort => {
                 trap_unreachable(fx, "[corruption] Unwinding bb reached.");
@@ -275,22 +410,22 @@ fn codegen_fn_content<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx, impl Backend>)
                 trap_unreachable(fx, "[corruption] Hit unreachable code.");
             }
             TerminatorKind::Yield { .. }
-            | TerminatorKind::FalseEdges { .. }
+            | TerminatorKind::FalseEdge { .. }
             | TerminatorKind::FalseUnwind { .. }
             | TerminatorKind::DropAndReplace { .. }
             | TerminatorKind::GeneratorDrop => {
                 bug!("shouldn't exist at trans {:?}", bb_data.terminator());
             }
             TerminatorKind::Drop {
-                location,
+                place,
                 target,
                 unwind: _,
             } => {
-                let drop_place = trans_place(fx, location);
-                crate::abi::codegen_drop(fx, drop_place);
+                let drop_place = trans_place(fx, *place);
+                crate::abi::codegen_drop(fx, bb_data.terminator().source_info.span, drop_place);
 
-                let target_ebb = fx.get_ebb(*target);
-                fx.bcx.ins().jump(target_ebb, &[]);
+                let target_block = fx.get_block(*target);
+                fx.bcx.ins().jump(target_block, &[]);
             }
         };
     }
@@ -299,20 +434,20 @@ 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>,
-    cur_ebb: Ebb,
+fn trans_stmt<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
+    #[allow(unused_variables)] cur_block: Block,
     stmt: &Statement<'tcx>,
 ) {
-    let _print_guard = PrintOnPanic(|| format!("stmt {:?}", stmt));
+    let _print_guard = crate::PrintOnPanic(|| format!("stmt {:?}", stmt));
 
     fx.set_debug_loc(stmt.source_info);
 
-    #[cfg(debug_assertions)]
+    #[cfg(false_debug_assertions)]
     match &stmt.kind {
         StatementKind::StorageLive(..) | StatementKind::StorageDead(..) => {} // Those are not very useful
         _ => {
-            let inst = fx.bcx.func.layout.last_inst(cur_ebb).unwrap();
+            let inst = fx.bcx.func.layout.last_inst(cur_block).unwrap();
             fx.add_comment(inst, format!("{:?}", stmt));
         }
     }
@@ -322,104 +457,46 @@ fn trans_stmt<'a, 'tcx: 'a>(
             place,
             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 as u64 as i64);
-                    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 as u64 as i64)
-                        };
-                        niche.write_cvalue(fx, niche_llval);
-                    }
-                }
-            }
+            let place = trans_place(fx, **place);
+            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);
                 }
-                Rvalue::Ref(_, _, place) => {
-                    let place = trans_place(fx, place);
-                    place.write_place_ref(fx, lval);
+                Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) => {
+                    let place = trans_place(fx, *place);
+                    let ref_ = place.place_ref(fx, lval.layout());
+                    lval.write_cvalue(fx, ref_);
+                }
+                Rvalue::ThreadLocalRef(def_id) => {
+                    let val = crate::constant::codegen_tls_ref(fx, *def_id, lval.layout());
+                    lval.write_cvalue(fx, val);
                 }
                 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) => {
@@ -427,183 +504,229 @@ fn trans_stmt<'a, 'tcx: 'a>(
                     let layout = operand.layout();
                     let val = operand.load_scalar(fx);
                     let res = match un_op {
-                        UnOp::Not => {
-                            match layout.ty.sty {
-                                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)
-                                }
-                                ty::Uint(_) | ty::Int(_) => fx.bcx.ins().bnot(val),
-                                _ => unimplemented!("un op Not for {:?}", layout.ty),
+                        UnOp::Not => match layout.ty.kind() {
+                            ty::Bool => {
+                                let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
+                                CValue::by_val(fx.bcx.ins().bint(types::I8, res), layout)
                             }
-                        }
-                        UnOp::Neg => match layout.ty.sty {
-                            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)
+                            ty::Uint(_) | ty::Int(_) => {
+                                CValue::by_val(fx.bcx.ins().bnot(val), layout)
+                            }
+                            _ => unreachable!("un op Not for {:?}", layout.ty),
+                        },
+                        UnOp::Neg => match layout.ty.kind() {
+                            ty::Int(IntTy::I128) => {
+                                // FIXME remove this case once ineg.i128 works
+                                let zero = CValue::const_val(fx, layout, 0);
+                                crate::num::trans_int_binop(fx, BinOp::Sub, zero, operand)
                             }
-                            ty::Float(_) => fx.bcx.ins().fneg(val),
-                            _ => unimplemented!("un op Neg for {:?}", layout.ty),
+                            ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
+                            ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
+                            _ => unreachable!("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
-                    {
+                Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), operand, to_ty) => {
+                    let from_ty = fx.monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx));
+                    let to_layout = fx.layout_of(fx.monomorphize(to_ty));
+                    match *from_ty.kind() {
                         ty::FnDef(def_id, substs) => {
                             let func_ref = fx.get_function_ref(
-                                Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs)
-                                    .unwrap(),
+                                Instance::resolve_for_fn_ptr(
+                                    fx.tcx,
+                                    ParamEnv::reveal_all(),
+                                    def_id,
+                                    substs,
+                                )
+                                .unwrap()
+                                .polymorphize(fx.tcx),
                             );
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
-                            lval.write_cvalue(fx, CValue::by_val(func_addr, layout));
+                            lval.write_cvalue(fx, CValue::by_val(func_addr, to_layout));
                         }
-                        _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", ty),
+                        _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", from_ty),
                     }
                 }
-                Rvalue::Cast(CastKind::Pointer(PointerCast::UnsafeFnPointer), operand, ty)
-                | Rvalue::Cast(CastKind::Pointer(PointerCast::MutToConstPointer), operand, ty) => {
+                Rvalue::Cast(CastKind::Pointer(PointerCast::UnsafeFnPointer), operand, to_ty)
+                | Rvalue::Cast(CastKind::Pointer(PointerCast::MutToConstPointer), operand, to_ty)
+                | Rvalue::Cast(CastKind::Pointer(PointerCast::ArrayToPointer), operand, to_ty) => {
+                    let to_layout = fx.layout_of(fx.monomorphize(to_ty));
                     let operand = trans_operand(fx, operand);
-                    let layout = fx.layout_of(ty);
-                    lval.write_cvalue(fx, operand.unchecked_cast_to(layout));
+                    lval.write_cvalue(fx, operand.cast_pointer_to(to_layout));
                 }
                 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)
                     }
 
                     if is_fat_ptr(fx, from_ty) {
                         if is_fat_ptr(fx, to_ty) {
                             // fat-ptr -> fat-ptr
-                            lval.write_cvalue(fx, operand.unchecked_cast_to(dest_layout));
+                            lval.write_cvalue(fx, operand.cast_pointer_to(dest_layout));
                         } else {
                             // fat-ptr -> thin-ptr
                             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));
-                        lval.write_cvalue(fx, discr);
+                        use rustc_target::abi::{Int, TagEncoding, Variants};
+
+                        match &operand.layout().variants {
+                            Variants::Single { index } => {
+                                let discr = operand
+                                    .layout()
+                                    .ty
+                                    .discriminant_for_variant(fx.tcx, *index)
+                                    .unwrap();
+                                let discr = if discr.ty.is_signed() {
+                                    rustc_middle::mir::interpret::sign_extend(
+                                        discr.val,
+                                        fx.layout_of(discr.ty).size,
+                                    )
+                                } else {
+                                    discr.val
+                                };
+
+                                let discr = CValue::const_val(fx, fx.layout_of(to_ty), discr);
+                                lval.write_cvalue(fx, discr);
+                            }
+                            Variants::Multiple {
+                                tag,
+                                tag_field,
+                                tag_encoding: TagEncoding::Direct,
+                                variants: _,
+                            } => {
+                                let cast_to = fx.clif_type(dest_layout.ty).unwrap();
+
+                                // Read the tag/niche-encoded discriminant from memory.
+                                let encoded_discr =
+                                    operand.value_field(fx, mir::Field::new(*tag_field));
+                                let encoded_discr = encoded_discr.load_scalar(fx);
+
+                                // Decode the discriminant (specifically if it's niche-encoded).
+                                let signed = match tag.value {
+                                    Int(_, signed) => signed,
+                                    _ => false,
+                                };
+                                let val = clif_intcast(fx, encoded_discr, cast_to, signed);
+                                let val = CValue::by_val(val, dest_layout);
+                                lval.write_cvalue(fx, val);
+                            }
+                            Variants::Multiple { .. } => unreachable!(),
+                        }
                     } 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
-                            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)
-                        };
+                        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) => {
+                Rvalue::Cast(
+                    CastKind::Pointer(PointerCast::ClosureFnPointer(_)),
+                    operand,
+                    _to_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,
                                 def_id,
                                 substs,
                                 ty::ClosureKind::FnOnce,
-                            );
+                            )
+                            .polymorphize(fx.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::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) => {
+                Rvalue::Cast(CastKind::Pointer(PointerCast::Unsize), operand, _to_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 place = trans_place(fx, *place);
+                    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) => {
                     let operand = trans_operand(fx, operand);
-                    for i in 0..*times {
-                        let index = fx.bcx.ins().iconst(fx.pointer_type, i as i64);
+                    let times = fx
+                        .monomorphize(times)
+                        .eval(fx.tcx, ParamEnv::reveal_all())
+                        .val
+                        .try_to_bits(fx.tcx.data_layout.pointer_size)
+                        .unwrap();
+                    if fx.clif_type(operand.layout().ty) == Some(types::I8) {
+                        let times = fx.bcx.ins().iconst(fx.pointer_type, times as i64);
+                        // FIXME use emit_small_memset where possible
+                        let addr = lval.to_ptr().get_addr(fx);
+                        let val = operand.load_scalar(fx);
+                        fx.bcx.call_memset(fx.cx.module.target_config(), addr, val, times);
+                    } else {
+                        let loop_block = fx.bcx.create_block();
+                        let done_block = fx.bcx.create_block();
+                        let index = fx.bcx.append_block_param(loop_block, fx.pointer_type);
+                        let zero = fx.bcx.ins().iconst(fx.pointer_type, 0);
+                        fx.bcx.ins().jump(loop_block, &[zero]);
+
+                        fx.bcx.switch_to_block(loop_block);
                         let to = lval.place_index(fx, index);
                         to.write_cvalue(fx, operand);
+
+                        let index = fx.bcx.ins().iadd_imm(index, 1);
+                        let done = fx.bcx.ins().icmp_imm(IntCC::Equal, index, times as i64);
+                        fx.bcx.ins().brz(done, loop_block, &[index]);
+                        fx.bcx.ins().jump(done_block, &[]);
+
+                        fx.bcx.switch_to_block(done_block);
                     }
                 }
                 Rvalue::Len(place) => {
-                    let place = trans_place(fx, place);
+                    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::by_val(len, usize_layout));
                 }
                 Rvalue::NullaryOp(NullOp::Box, content_ty) => {
-                    use rustc::middle::lang_items::ExchangeMallocFnLangItem;
-
                     let usize_type = fx.clif_type(fx.tcx.types.usize).unwrap();
+                    let content_ty = fx.monomorphize(content_ty);
                     let layout = fx.layout_of(content_ty);
                     let llsize = fx.bcx.ins().iconst(usize_type, layout.size.bytes() as i64);
                     let llalign = fx
@@ -613,7 +736,11 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                     let box_layout = fx.layout_of(fx.tcx.mk_box(content_ty));
 
                     // Allocate space:
-                    let def_id = match fx.tcx.lang_items().require(ExchangeMallocFnLangItem) {
+                    let def_id = match fx
+                        .tcx
+                        .lang_items()
+                        .require(rustc_hir::LangItem::ExchangeMalloc)
+                    {
                         Ok(id) => id,
                         Err(s) => {
                             fx.tcx
@@ -621,7 +748,7 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                                 .fatal(&format!("allocation of `{}` {}", box_layout.ty, s));
                         }
                     };
-                    let instance = ty::Instance::mono(fx.tcx, def_id);
+                    let instance = ty::Instance::mono(fx.tcx, def_id).polymorphize(fx.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];
@@ -631,9 +758,10 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
                     assert!(lval
                         .layout()
                         .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);
+                        .is_sized(fx.tcx.at(stmt.source_info.span), ParamEnv::reveal_all()));
+                    let ty_size = fx.layout_of(fx.monomorphize(ty)).size.bytes();
+                    let val =
+                        CValue::const_val(fx, fx.layout_of(fx.tcx.types.usize), ty_size.into());
                     lval.write_cvalue(fx, val);
                 }
                 Rvalue::Aggregate(kind, operands) => match **kind {
@@ -645,7 +773,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),
                 },
             }
         }
@@ -656,46 +784,72 @@ fn is_fat_ptr<'a, 'tcx: 'a>(fx: &FunctionCx<'a, 'tcx, impl Backend>, ty: Ty<'tcx
         | StatementKind::Retag { .. }
         | StatementKind::AscribeUserType(..) => {}
 
-        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
+        StatementKind::LlvmInlineAsm(asm) => {
+            use rustc_span::symbol::Symbol;
+            let LlvmInlineAsm {
+                asm,
+                outputs,
+                inputs,
+            } = &**asm;
+            let rustc_hir::LlvmInlineAsmInner {
+                asm: asm_code,         // Name
+                outputs: output_names, // Vec<LlvmInlineAsmOutput>
+                inputs: input_names,   // Vec<Name>
+                clobbers,              // Vec<Name>
+                volatile,              // bool
+                alignstack,            // bool
+                dialect: _,
                 asm_str_style: _,
-                ctxt: _,
             } = asm;
-            match &*asm_code.as_str() {
-                "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);
+            match asm_code.as_str().trim() {
+                "" => {
+                    // Black box
+                }
+                "mov %rbx, %rsi\n                  cpuid\n                  xchg %rbx, %rsi" => {
+                    assert_eq!(
+                        input_names,
+                        &[Symbol::intern("{eax}"), Symbol::intern("{ecx}")]
+                    );
+                    assert_eq!(output_names.len(), 4);
+                    for (i, c) in (&["={eax}", "={esi}", "={ecx}", "={edx}"])
+                        .iter()
+                        .enumerate()
+                    {
+                        assert_eq!(&output_names[i].constraint.as_str(), c);
+                        assert!(!output_names[i].is_rw);
+                        assert!(!output_names[i].is_indirect);
                     }
 
-                    assert_eq!(clobbers, &[Name::intern("rbx")]);
+                    assert_eq!(clobbers, &[]);
 
                     assert!(!volatile);
                     assert!(!alignstack);
 
-                    crate::trap::trap_unimplemented(fx, "__cpuid_count arch intrinsic is not supported");
+                    assert_eq!(inputs.len(), 2);
+                    let leaf = trans_operand(fx, &inputs[0].1).load_scalar(fx); // %eax
+                    let subleaf = trans_operand(fx, &inputs[1].1).load_scalar(fx); // %ecx
+
+                    let (eax, ebx, ecx, edx) =
+                        crate::intrinsics::codegen_cpuid_call(fx, leaf, subleaf);
+
+                    assert_eq!(outputs.len(), 4);
+                    trans_place(fx, outputs[0])
+                        .write_cvalue(fx, CValue::by_val(eax, fx.layout_of(fx.tcx.types.u32)));
+                    trans_place(fx, outputs[1])
+                        .write_cvalue(fx, CValue::by_val(ebx, fx.layout_of(fx.tcx.types.u32)));
+                    trans_place(fx, outputs[2])
+                        .write_cvalue(fx, CValue::by_val(ecx, fx.layout_of(fx.tcx.types.u32)));
+                    trans_place(fx, outputs[3])
+                        .write_cvalue(fx, CValue::by_val(edx, fx.layout_of(fx.tcx.types.u32)));
                 }
                 "xgetbv" => {
-                    assert_eq!(inputs, &[Name::intern("{ecx}")]);
+                    assert_eq!(input_names, &[Symbol::intern("{ecx}")]);
 
-                    assert_eq!(outputs.len(), 2);
+                    assert_eq!(output_names.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!(&output_names[i].constraint.as_str(), c);
+                        assert!(!output_names[i].is_rw);
+                        assert!(!output_names[i].is_indirect);
                     }
 
                     assert_eq!(clobbers, &[]);
@@ -705,601 +859,131 @@ 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");
                 }
-                _ => unimpl!("Inline assembly is not supported"),
+                // ___chkstk, ___chkstk_ms and __alloca are only used on Windows
+                _ if fx
+                    .tcx
+                    .symbol_name(fx.instance)
+                    .name
+                    .starts_with("___chkstk") =>
+                {
+                    crate::trap::trap_unimplemented(fx, "Stack probes are not supported");
+                }
+                _ if fx.tcx.symbol_name(fx.instance).name == "__alloca" => {
+                    crate::trap::trap_unimplemented(fx, "Alloca is not supported");
+                }
+                // Used in sys::windows::abort_internal
+                "int $$0x29" => {
+                    crate::trap::trap_unimplemented(fx, "Windows abort");
+                }
+                _ => fx
+                    .tcx
+                    .sess
+                    .span_fatal(stmt.source_info.span, "Inline assembly is not supported"),
             }
         }
+        StatementKind::Coverage { .. } => fx.tcx.sess.fatal("-Zcoverage is unimplemented"),
     }
 }
 
-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 = fx
+                .monomorphize(&len)
+                .eval(fx.tcx, ParamEnv::reveal_all())
+                .eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64;
             fx.bcx.ins().iconst(fx.pointer_type, len)
         }
         ty::Slice(_elem_ty) => place
-            .to_addr_maybe_unsized(fx)
+            .to_ptr_maybe_unsized()
             .1
             .expect("Length metadata for slice place"),
         _ => bug!("Rvalue::Len({:?})", place),
     }
 }
 
-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(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::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);
-            }
-        }
-    }
-}
-
-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::by_val($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::by_val($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::by_val($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"
-        );
-    }
-
-    if out_ty == fx.tcx.types.u128 || out_ty == fx.tcx.types.i128 {
-        return match (bin_op, signed) {
-            _ => {
-                let layout = fx.layout_of(out_ty);
-                let a = fx.bcx.ins().iconst(types::I64, 42);
-                let b = fx.bcx.ins().iconst(types::I64, 0);
-                let val = fx.bcx.ins().iconcat(a, b);
-                CValue::by_val(val, layout)
-            }
-        }
-    }
-
-    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"
-        );
-    }
+pub(crate) fn trans_place<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
+    place: Place<'tcx>,
+) -> CPlace<'tcx> {
+    let mut cplace = fx.get_local_place(place.local);
 
-    let lhs = in_lhs.load_scalar(fx);
-    let rhs = in_rhs.load_scalar(fx);
-    let (res, has_overflow) = if in_lhs.layout().ty == fx.tcx.types.u128 || in_lhs.layout().ty == fx.tcx.types.i128 {
-        match (bin_op, signed) {
-            _ => {
-                let a = fx.bcx.ins().iconst(types::I64, 42);
-                let b = fx.bcx.ins().iconst(types::I64, 0);
-                (fx.bcx.ins().iconcat(a, b), fx.bcx.ins().bconst(types::B1, false))
+    for elem in place.projection {
+        match elem {
+            PlaceElem::Deref => {
+                cplace = cplace.place_deref(fx);
             }
-        }
-    } else {
-        match bin_op {
-            BinOp::Add => {
-                /*let (val, c_out) = fx.bcx.ins().iadd_cout(lhs, rhs);
-                (val, c_out)*/
-                // FIXME(CraneStation/cranelift#849) legalize iadd_cout for i8 and i16
-                let val = fx.bcx.ins().iadd(lhs, rhs);
-                let has_overflow = if !signed {
-                    fx.bcx.ins().icmp(IntCC::UnsignedLessThan, val, lhs)
-                } else {
-                    let rhs_is_negative = fx.bcx.ins().icmp_imm(IntCC::SignedLessThan, rhs, 0);
-                    let slt = fx.bcx.ins().icmp(IntCC::SignedLessThan, val, lhs);
-                    fx.bcx.ins().bxor(rhs_is_negative, slt)
-                };
-                (val, has_overflow)
+            PlaceElem::Field(field, _ty) => {
+                cplace = cplace.place_field(fx, field);
             }
-            BinOp::Sub => {
-                /*let (val, b_out) = fx.bcx.ins().isub_bout(lhs, rhs);
-                (val, b_out)*/
-                // FIXME(CraneStation/cranelift#849) legalize isub_bout for i8 and i16
-                let val = fx.bcx.ins().isub(lhs, rhs);
-                let has_overflow = if !signed {
-                    fx.bcx.ins().icmp(IntCC::UnsignedGreaterThan, val, lhs)
-                } else {
-                    let rhs_is_negative = fx.bcx.ins().icmp_imm(IntCC::SignedLessThan, rhs, 0);
-                    let sgt = fx.bcx.ins().icmp(IntCC::SignedGreaterThan, val, lhs);
-                    fx.bcx.ins().bxor(rhs_is_negative, sgt)
-                };
-                (val, has_overflow)
+            PlaceElem::Index(local) => {
+                let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
+                cplace = cplace.place_index(fx, index);
             }
-            BinOp::Mul => {
-                let val = fx.bcx.ins().imul(lhs, rhs);
-                /*let val_hi = if !signed {
-                    fx.bcx.ins().umulhi(lhs, rhs)
-                } else {
-                    fx.bcx.ins().smulhi(lhs, rhs)
-                };
-                let has_overflow = fx.bcx.ins().icmp_imm(IntCC::NotEqual, val_hi, 0);*/
-                // TODO: check for overflow
-                let has_overflow = fx.bcx.ins().bconst(types::B1, false);
-                (val, has_overflow)
-            }
-            BinOp::Shl => {
-                let val = fx.bcx.ins().ishl(lhs, rhs);
-                // TODO: check for overflow
-                let has_overflow = fx.bcx.ins().bconst(types::B1, false);
-                (val, has_overflow)
-            }
-            BinOp::Shr => {
-                let val = if !signed {
-                    fx.bcx.ins().ushr(lhs, rhs)
+            PlaceElem::ConstantIndex {
+                offset,
+                min_length: _,
+                from_end,
+            } => {
+                let offset: u64 = offset;
+                let index = if !from_end {
+                    fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
                 } else {
-                    fx.bcx.ins().sshr(lhs, rhs)
+                    let len = codegen_array_len(fx, cplace);
+                    fx.bcx.ins().iadd_imm(len, -(offset as i64))
                 };
-                // TODO: check for overflow
-                let has_overflow = fx.bcx.ins().bconst(types::B1, false);
-                (val, has_overflow)
-            }
-            _ => bug!(
-                "binop {:?} on checked int/uint lhs: {:?} rhs: {:?}",
-                bin_op,
-                in_lhs,
-                in_rhs
-            ),
-        }
-    };
-
-    let has_overflow = fx.bcx.ins().bint(types::I8, has_overflow);
-    let out_place = CPlace::new_stack_slot(fx, out_ty);
-    let out_layout = out_place.layout();
-    out_place.write_cvalue(fx, CValue::by_val_pair(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!(),
+                cplace = cplace.place_index(fx, index);
             }
-        });
-        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::by_val(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)
-            }
-            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)
-            }
-            BinOp::Lt | BinOp::Le | BinOp::Ge | BinOp::Gt => {
-                let ptr_eq = fx.bcx.ins().icmp(IntCC::Equal, lhs_ptr, rhs_ptr);
-
-                let ptr_cmp = fx.bcx.ins().icmp(match bin_op {
-                    BinOp::Lt => IntCC::UnsignedLessThan,
-                    BinOp::Le => IntCC::UnsignedLessThanOrEqual,
-                    BinOp::Ge => IntCC::UnsignedGreaterThanOrEqual,
-                    BinOp::Gt => IntCC::UnsignedGreaterThan,
-                    _ => unreachable!(),
-                }, lhs_ptr, rhs_ptr);
-
-                let extra_cmp = fx.bcx.ins().icmp(match bin_op {
-                    BinOp::Lt => IntCC::UnsignedLessThan,
-                    BinOp::Le => IntCC::UnsignedLessThanOrEqual,
-                    BinOp::Ge => IntCC::UnsignedGreaterThanOrEqual,
-                    BinOp::Gt => IntCC::UnsignedGreaterThan,
+            PlaceElem::Subslice { from, to, from_end } => {
+                // These indices are generated by slice patterns.
+                // slice[from:-to] in Python terms.
+
+                let from: u64 = from;
+                let to: u64 = to;
+
+                match cplace.layout().ty.kind() {
+                    ty::Array(elem_ty, _len) => {
+                        assert!(!from_end, "array subslices are never `from_end`");
+                        let elem_layout = fx.layout_of(elem_ty);
+                        let ptr = cplace.to_ptr();
+                        cplace = CPlace::for_ptr(
+                            ptr.offset_i64(fx, elem_layout.size.bytes() as i64 * (from as i64)),
+                            fx.layout_of(fx.tcx.mk_array(elem_ty, u64::from(to) - u64::from(from))),
+                        );
+                    }
+                    ty::Slice(elem_ty) => {
+                        assert!(from_end, "slice subslices should be `from_end`");
+                        let elem_layout = fx.layout_of(elem_ty);
+                        let (ptr, len) = cplace.to_ptr_maybe_unsized();
+                        let len = len.unwrap();
+                        cplace = CPlace::for_ptr_with_extra(
+                            ptr.offset_i64(fx, elem_layout.size.bytes() as i64 * (from as i64)),
+                            fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64)),
+                            cplace.layout(),
+                        );
+                    }
                     _ => unreachable!(),
-                }, lhs_extra, rhs_extra);
-
-                fx.bcx.ins().select(ptr_eq, extra_cmp, ptr_cmp)
-            }
-            _ => panic!("bin_op {:?} on ptr", bin_op),
-        };
-
-        assert_eq!(fx.tcx.types.bool, ret_ty);
-        let ret_layout = fx.layout_of(ret_ty);
-        CValue::by_val(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> {
-    let base = 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::Promoted(promoted) => {
-                crate::constant::trans_promoted(fx, 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).unwrap_usize(fx.tcx);
-                    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(),
-                    )
-                }
-                _ => 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(crate) fn trans_operand<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     operand: &Operand<'tcx>,
 ) -> CValue<'tcx> {
     match operand {
         Operand::Move(place) | Operand::Copy(place) => {
-            let cplace = trans_place(fx, place);
+            let cplace = trans_place(fx, *place);
             cplace.to_cvalue(fx)
         }
         Operand::Constant(const_) => crate::constant::trans_constant(fx, const_),