]> git.lizzy.rs Git - rust.git/blobdiff - src/base.rs
FunctionCx: WIP: Fix overzealous sed usage
[rust.git] / src / base.rs
index 144199a5b4f54611a974b6f547d7b9d63c215e29..bdcb931b827b715ba924440423998cc330f2ec7b 100644 (file)
@@ -3,22 +3,18 @@
 
 use crate::prelude::*;
 
-pub(crate) fn trans_fn<'clif, 'tcx, 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,
 ) {
-    let tcx = cx.tcx;
+    let tcx = cx.codegen_cx.tcx;
 
-    let mir = *tcx.instance_mir(instance.def);
+    let mir = tcx.instance_mir(instance.def);
 
     // Declare function
-    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(debug_context, instance, func_id, &name));
+    let (name, sig) = get_function_name_and_sig(tcx, cx.codegen_cx.module.isa().triple(), instance, false);
+    let func_id = cx.codegen_cx.module.declare_function(&name, linkage, &sig).unwrap();
 
     // Make FunctionBuilder
     let context = &mut cx.cached_context;
@@ -34,12 +30,13 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     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 pointer_type = cx.codegen_cx.module.target_config().pointer_type();
     let clif_comments = crate::pretty_clif::CommentWriter::new(tcx, instance);
 
     let mut fx = FunctionCx {
         tcx,
-        module: cx.module,
+        module: &mut cx.codegen_cx.module,
+        global_asm: &mut cx.global_asm,
         pointer_type,
 
         instance,
@@ -55,98 +52,20 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
         constants_cx: &mut cx.constants_cx,
         vtables: &mut cx.vtables,
         source_info_set: indexmap::IndexSet::new(),
+        next_ssa_var: 0,
+
+        inline_asm_index: 0,
     };
 
     let arg_uninhabited = fx.mir.args_iter().any(|arg| fx.layout_of(fx.monomorphize(&fx.mir.local_decls[arg].ty)).abi.is_uninhabited());
-    let is_call_once_for_box = name.starts_with("_ZN83_$LT$alloc..boxed..Box$LT$F$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$9call_once");
 
     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 if is_call_once_for_box {
-        // HACK implement `<Box<F> as FnOnce>::call_once` without `alloca`.
-        tcx.sess.time("codegen prelude", || crate::abi::codegen_fn_prelude(&mut fx, start_block, false));
-        fx.bcx.switch_to_block(fx.block_map[START_BLOCK]);
-        let bb_data = &fx.mir.basic_blocks()[START_BLOCK];
-        let destination = match &bb_data.terminator().kind {
-            TerminatorKind::Call {
-                func,
-                args,
-                destination,
-                cleanup: _,
-                from_hir_call: _,
-            } => {
-                assert_eq!(args.len(), 2);
-
-                let closure_arg = Local::new(1);
-                let closure_local = args[0].place().unwrap().as_local().unwrap();
-                assert_eq!(fx.mir.local_decls[closure_local].ty, fx.mir.local_decls[closure_arg].ty.builtin_deref(true).unwrap().ty);
-                let closure_deref = fx.local_map[&closure_arg].place_deref(&mut fx);
-                fx.local_map.insert(closure_local, closure_deref);
-
-                let args_arg = Local::new(2);
-                let args_local = args[1].place().unwrap().as_local().unwrap();
-                assert_eq!(fx.mir.local_decls[args_local].ty, fx.mir.local_decls[args_arg].ty);
-                fx.local_map.insert(args_local, fx.local_map[&args_arg]);
-
-                fx.tcx.sess.time("codegen call", || crate::abi::codegen_terminator_call(
-                    &mut fx,
-                    bb_data.terminator().source_info.span,
-                    func,
-                    args,
-                    *destination,
-                ));
-                destination.map(|(_ret_place, ret_block)| ret_block)
-            }
-            _ => unreachable!(),
-        };
-
-        let destination = if let Some(destination) = destination {
-            fx.bcx.switch_to_block(fx.block_map[destination]);
-            let bb_data = &fx.mir.basic_blocks()[destination];
-            match &bb_data.terminator().kind {
-                TerminatorKind::Call {
-                    func,
-                    args,
-                    destination,
-                    cleanup: _,
-                    from_hir_call: _,
-                } => {
-                    match destination {
-                        Some((ret_place, _ret_block)) => {
-                            fx.local_map.insert(ret_place.as_local().unwrap(), CPlace::no_place(fx.layout_of(fx.tcx.mk_unit())));
-                        }
-                        None => {}
-                    }
-
-                    assert_eq!(args.len(), 1);
-                    fx.tcx.sess.time("codegen call", || crate::abi::codegen_terminator_call(
-                        &mut fx,
-                        bb_data.terminator().source_info.span,
-                        func,
-                        args,
-                        *destination,
-                    ));
-                    destination.map(|(_ret_place, ret_block)| ret_block)
-                }
-                _ => unreachable!(),
-            }
-        } else {
-            None
-        };
-
-        if let Some(destination) = destination {
-            fx.bcx.switch_to_block(fx.block_map[destination]);
-            let bb_data = &fx.mir.basic_blocks()[destination];
-            match &bb_data.terminator().kind {
-                TerminatorKind::Return => crate::abi::codegen_return(&mut fx),
-                _ => unreachable!(),
-            }
-        }
     } else {
         tcx.sess.time("codegen clif ir", || {
-            tcx.sess.time("codegen prelude", || crate::abi::codegen_fn_prelude(&mut fx, start_block, true));
+            tcx.sess.time("codegen prelude", || crate::abi::codegen_fn_prelude(&mut fx, start_block));
             codegen_fn_content(&mut fx);
         });
     }
@@ -158,8 +77,14 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     let local_map = fx.local_map;
     let cold_blocks = fx.cold_blocks;
 
-    #[cfg(debug_assertions)]
-    crate::pretty_clif::write_clif_file(cx.tcx, "unopt", instance, &context.func, &clif_comments, None);
+    crate::pretty_clif::write_clif_file(
+        cx.codegen_cx.tcx,
+        "unopt",
+        None,
+        instance,
+        &context,
+        &clif_comments,
+    );
 
     // Verify function
     verify_func(tcx, &clif_comments, &context.func);
@@ -173,10 +98,10 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     // instruction, which doesn't have an encoding.
     context.compute_cfg();
     context.compute_domtree();
-    context.eliminate_unreachable_code(cx.module.isa()).unwrap();
+    context.eliminate_unreachable_code(cx.codegen_cx.module.isa()).unwrap();
 
     // Define function
-    let module = &mut cx.module;
+    let module = &mut cx.codegen_cx.module;
     tcx.sess.time(
         "define function",
         || module.define_function(
@@ -187,28 +112,24 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     );
 
     // Write optimized function to file for debugging
-    #[cfg(debug_assertions)]
-    {
-        let value_ranges = context
-            .build_value_labels_ranges(cx.module.isa())
-            .expect("value location ranges");
-
-        crate::pretty_clif::write_clif_file(
-            cx.tcx,
-            "opt",
-            instance,
-            &context.func,
-            &clif_comments,
-            Some(&value_ranges),
-        );
-    }
+    crate::pretty_clif::write_clif_file(
+        cx.codegen_cx.tcx,
+        "opt",
+        Some(cx.codegen_cx.module.isa()),
+        instance,
+        &context,
+        &clif_comments,
+    );
 
     // Define debuginfo for function
-    let isa = cx.module.isa();
+    let isa = cx.codegen_cx.module.isa();
+    let debug_context = &mut cx.debug_context;
+    let unwind_context = &mut cx.unwind_context;
     tcx.sess.time("generate debug info", || {
-        debug_context
-            .as_mut()
-            .map(|x| x.define(context, isa, &source_info_set, local_map));
+        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
@@ -217,12 +138,12 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
 
 pub(crate) fn verify_func(tcx: TyCtxt<'_>, writer: &crate::pretty_clif::CommentWriter, func: &Function) {
     tcx.sess.time("verify clif ir", || {
-        let flags = settings::Flags::new(settings::builder());
-        match ::cranelift_codegen::verify_function(&func, &flags) {
+        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(
+                let pretty_error = cranelift_codegen::print_errors::pretty_verifier_error(
                     &func,
                     None,
                     Some(Box::new(writer)),
@@ -236,6 +157,8 @@ pub(crate) fn verify_func(tcx: TyCtxt<'_>, writer: &crate::pretty_clif::CommentW
 }
 
 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);
@@ -301,8 +224,8 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 target,
                 cleanup: _,
             } => {
-                if !fx.tcx.sess.overflow_checks() {
-                    if let mir::AssertKind::OverflowNeg = *msg {
+                if !fx.codegen_cx.tcx.sess.overflow_checks() {
+                    if let mir::AssertKind::OverflowNeg(_) = *msg {
                         let target = fx.get_block(*target);
                         fx.bcx.ins().jump(target, &[]);
                         continue;
@@ -322,14 +245,36 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 fx.bcx.ins().jump(target, &[]);
 
                 fx.bcx.switch_to_block(failure);
-                trap_panic(
-                    fx,
-                    format!(
-                        "[panic] Assert {:?} at {:?} failed.",
-                        msg,
-                        bb_data.terminator().source_info.span
-                    ),
-                );
+
+                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::lang_items::PanicBoundsCheckFnLangItem
+                    }
+                    _ => {
+                        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::lang_items::PanicFnLangItem
+                    }
+                };
+
+                let def_id = fx.codegen_cx.tcx.lang_items().require(lang_item).unwrap_or_else(|s| {
+                    fx.codegen_cx.tcx.sess.span_fatal(bb_data.terminator().source_info.span, &s)
+                });
+
+                let instance = Instance::mono(fx.codegen_cx.tcx, def_id).polymorphize(fx.codegen_cx.tcx);
+                let symbol_name = fx.codegen_cx.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 {
@@ -342,7 +287,7 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 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 as u64, block);
+                    switch.set_entry(*value, block);
                 }
                 let otherwise_block = fx.get_block(targets[targets.len() - 1]);
                 switch.emit(&mut fx.bcx, discr, otherwise_block);
@@ -351,17 +296,44 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 func,
                 args,
                 destination,
+                fn_span,
                 cleanup: _,
                 from_hir_call: _,
             } => {
-                fx.tcx.sess.time("codegen call", || crate::abi::codegen_terminator_call(
+                fx.codegen_cx.tcx.sess.time("codegen call", || crate::abi::codegen_terminator_call(
                     fx,
-                    bb_data.terminator().source_info.span,
+                    *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.");
             }
@@ -369,18 +341,18 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, 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);
+                let drop_place = trans_place(fx, *place);
                 crate::abi::codegen_drop(fx, bb_data.terminator().source_info.span, drop_place);
 
                 let target_block = fx.get_block(*target);
@@ -399,7 +371,7 @@ fn trans_stmt<'tcx>(
     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);
 
@@ -432,6 +404,10 @@ fn trans_stmt<'tcx>(
                     let place = trans_place(fx, *place);
                     place.write_place_ref(fx, lval);
                 }
+                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 lhs = trans_operand(fx, lhs);
                     let rhs = trans_operand(fx, rhs);
@@ -443,7 +419,7 @@ fn trans_stmt<'tcx>(
                     let lhs = trans_operand(fx, lhs);
                     let rhs = trans_operand(fx, rhs);
 
-                    let res = if !fx.tcx.sess.overflow_checks() {
+                    let res = if !fx.codegen_cx.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);
@@ -489,13 +465,14 @@ fn trans_stmt<'tcx>(
                     lval.write_cvalue(fx, res);
                 }
                 Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), operand, to_ty) => {
-                    let from_ty = fx.monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx));
+                    let from_ty = fx.monomorphize(&operand.ty(&fx.mir.local_decls, fx.codegen_cx.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_for_fn_ptr(fx.tcx, ParamEnv::reveal_all(), def_id, substs)
-                                    .unwrap(),
+                                Instance::resolve_for_fn_ptr(fx.codegen_cx.tcx, ParamEnv::reveal_all(), def_id, substs)
+                                    .unwrap()
+                                    .polymorphize(fx.codegen_cx.tcx),
                             );
                             let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
                             lval.write_cvalue(fx, CValue::by_val(func_addr, to_layout));
@@ -524,7 +501,7 @@ fn is_fat_ptr<'tcx>(
                                 |ty::TypeAndMut {
                                      ty: pointee_ty,
                                      mutbl: _,
-                                 }| has_ptr_meta(fx.tcx, pointee_ty),
+                                 }| has_ptr_meta(fx.codegen_cx.tcx, pointee_ty),
                             )
                             .unwrap_or(false)
                     }
@@ -546,12 +523,43 @@ fn is_fat_ptr<'tcx>(
                             _ => unreachable!("cast adt {} -> {}", from_ty, to_ty),
                         }
 
-                        let discr = crate::discriminant::codegen_get_discriminant(
-                            fx,
-                            operand,
-                            fx.layout_of(to_ty),
-                        );
-                        lval.write_cvalue(fx, discr);
+                        use rustc_target::abi::{TagEncoding, Int, Variants};
+
+                        match &operand.layout().variants {
+                            Variants::Single { index } => {
+                                let discr = operand.layout().ty.discriminant_for_variant(fx.codegen_cx.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 to_clif_ty = fx.clif_type(to_ty).unwrap();
                         let from = operand.load_scalar(fx);
@@ -571,11 +579,11 @@ fn is_fat_ptr<'tcx>(
                     match operand.layout().ty.kind {
                         ty::Closure(def_id, substs) => {
                             let instance = Instance::resolve_closure(
-                                fx.tcx,
+                                fx.codegen_cx.tcx,
                                 def_id,
                                 substs,
                                 ty::ClosureKind::FnOnce,
-                            );
+                            ).polymorphize(fx.codegen_cx.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()));
@@ -598,9 +606,9 @@ fn is_fat_ptr<'tcx>(
                     let operand = trans_operand(fx, operand);
                     let times = fx
                         .monomorphize(times)
-                        .eval(fx.tcx, ParamEnv::reveal_all())
+                        .eval(fx.codegen_cx.tcx, ParamEnv::reveal_all())
                         .val
-                        .try_to_bits(fx.tcx.data_layout.pointer_size)
+                        .try_to_bits(fx.codegen_cx.tcx.data_layout.pointer_size)
                         .unwrap();
                     for i in 0..times {
                         let index = fx.bcx.ins().iconst(fx.pointer_type, i as i64);
@@ -610,14 +618,14 @@ fn is_fat_ptr<'tcx>(
                 }
                 Rvalue::Len(place) => {
                     let place = trans_place(fx, *place);
-                    let usize_layout = fx.layout_of(fx.tcx.types.usize);
+                    let usize_layout = fx.layout_of(fx.codegen_cx.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_hir::lang_items::ExchangeMallocFnLangItem;
 
-                    let usize_type = fx.clif_type(fx.tcx.types.usize).unwrap();
+                    let usize_type = fx.clif_type(fx.codegen_cx.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);
@@ -625,18 +633,18 @@ fn is_fat_ptr<'tcx>(
                         .bcx
                         .ins()
                         .iconst(usize_type, layout.align.abi.bytes() as i64);
-                    let box_layout = fx.layout_of(fx.tcx.mk_box(content_ty));
+                    let box_layout = fx.layout_of(fx.codegen_cx.tcx.mk_box(content_ty));
 
                     // Allocate space:
-                    let def_id = match fx.tcx.lang_items().require(ExchangeMallocFnLangItem) {
+                    let def_id = match fx.codegen_cx.tcx.lang_items().require(ExchangeMallocFnLangItem) {
                         Ok(id) => id,
                         Err(s) => {
-                            fx.tcx
+                            fx.codegen_cx.tcx
                                 .sess
                                 .fatal(&format!("allocation of `{}` {}", box_layout.ty, s));
                         }
                     };
-                    let instance = ty::Instance::mono(fx.tcx, def_id);
+                    let instance = ty::Instance::mono(fx.codegen_cx.tcx, def_id).polymorphize(fx.codegen_cx.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];
@@ -646,9 +654,9 @@ fn is_fat_ptr<'tcx>(
                     assert!(lval
                         .layout()
                         .ty
-                        .is_sized(fx.tcx.at(stmt.source_info.span), ParamEnv::reveal_all()));
+                        .is_sized(fx.codegen_cx.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());
+                    let val = CValue::const_val(fx, fx.layout_of(fx.codegen_cx.tcx.types.usize), ty_size.into());
                     lval.write_cvalue(fx, val);
                 }
                 Rvalue::Aggregate(kind, operands) => match **kind {
@@ -672,60 +680,60 @@ fn is_fat_ptr<'tcx>(
         | StatementKind::AscribeUserType(..) => {}
 
         StatementKind::LlvmInlineAsm(asm) => {
-            use rustc_ast::ast::Name;
+            use rustc_span::symbol::Symbol;
             let LlvmInlineAsm {
                 asm,
-                outputs: _,
-                inputs: _,
+                outputs,
+                inputs,
             } = &**asm;
             let rustc_hir::LlvmInlineAsmInner {
                 asm: asm_code, // Name
-                outputs,       // Vec<Name>
-                inputs,        // Vec<Name>
+                outputs: output_names, // Vec<LlvmInlineAsmOutput>
+                inputs: input_names,   // Vec<Name>
                 clobbers,      // Vec<Name>
                 volatile,      // bool
                 alignstack,    // bool
-                dialect: _,    // rustc_ast::ast::AsmDialect
+                dialect: _,
                 asm_str_style: _,
             } = asm;
-            match &*asm_code.as_str() {
+            match asm_code.as_str().trim() {
                 "" => {
-                    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);
+                "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.codegen_cx.tcx.types.u32)));
+                    trans_place(fx, outputs[1]).write_cvalue(fx, CValue::by_val(ebx, fx.layout_of(fx.codegen_cx.tcx.types.u32)));
+                    trans_place(fx, outputs[2]).write_cvalue(fx, CValue::by_val(ecx, fx.layout_of(fx.codegen_cx.tcx.types.u32)));
+                    trans_place(fx, outputs[3]).write_cvalue(fx, CValue::by_val(edx, fx.layout_of(fx.codegen_cx.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, &[]);
@@ -735,7 +743,18 @@ fn is_fat_ptr<'tcx>(
 
                     crate::trap::trap_unimplemented(fx, "_xgetbv arch intrinsic is not supported");
                 }
-                _ => unimpl_fatal!(fx.tcx, stmt.source_info.span, "Inline assembly is not supported"),
+                // ___chkstk, ___chkstk_ms and __alloca are only used on Windows
+                _ if fx.codegen_cx.tcx.symbol_name(fx.instance).name.starts_with("___chkstk") => {
+                    crate::trap::trap_unimplemented(fx, "Stack probes are not supported");
+                }
+                _ if fx.codegen_cx.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.codegen_cx.tcx.sess.span_fatal(stmt.source_info.span, "Inline assembly is not supported"),
             }
         }
     }
@@ -748,8 +767,8 @@ fn codegen_array_len<'tcx>(
     match place.layout().ty.kind {
         ty::Array(_elem_ty, len) => {
             let len = fx.monomorphize(&len)
-                .eval(fx.tcx, ParamEnv::reveal_all())
-                .eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64;
+                .eval(fx.codegen_cx.tcx, ParamEnv::reveal_all())
+                .eval_usize(fx.codegen_cx.tcx, ParamEnv::reveal_all()) as i64;
             fx.bcx.ins().iconst(fx.pointer_type, len)
         }
         ty::Slice(_elem_ty) => place
@@ -767,7 +786,7 @@ pub(crate) fn trans_place<'tcx>(
     let mut cplace = fx.get_local_place(place.local);
 
     for elem in place.projection {
-        match *elem {
+        match elem {
             PlaceElem::Deref => {
                 cplace = cplace.place_deref(fx);
             }
@@ -784,10 +803,10 @@ pub(crate) fn trans_place<'tcx>(
                 from_end,
             } => {
                 let index = if !from_end {
-                    fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
+                    fx.bcx.ins().iconst(fx.pointer_type, i64::from(offset))
                 } else {
                     let len = codegen_array_len(fx, cplace);
-                    fx.bcx.ins().iadd_imm(len, -(offset as i64))
+                    fx.bcx.ins().iadd_imm(len, -i64::from(offset))
                 };
                 cplace = cplace.place_index(fx, index);
             }
@@ -801,8 +820,8 @@ pub(crate) fn trans_place<'tcx>(
                         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, to as u64 - from as u64)),
+                            ptr.offset_i64(fx, elem_layout.size.bytes() as i64 * i64::from(from)),
+                            fx.layout_of(fx.codegen_cx.tcx.mk_array(elem_ty, u64::from(to) - u64::from(from))),
                         );
                     }
                     ty::Slice(elem_ty) => {
@@ -811,8 +830,8 @@ pub(crate) fn trans_place<'tcx>(
                         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)),
+                            ptr.offset_i64(fx, elem_layout.size.bytes() as i64 * i64::from(from)),
+                            fx.bcx.ins().iadd_imm(len, -(i64::from(from) + i64::from(to))),
                             cplace.layout(),
                         );
                     }