Rustup to rustc 1.40.0-nightly (9e346646e 2019-11-08)

[rust.git] / src / base.rs

diff --git a/src/base.rs b/src/base.rs
index e58ab93158a715d58fa209c7dd226052505e3c76..007ff5390de5d0a64d1bbce41aca53d52ae6aa37 100644 (file)
--- a/src/base.rs
+++ b/src/base.rs
@@ -17,10 +17,12 @@ pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
     let mut debug_context = cx
         .debug_context
         .as_mut()
-        .map(|debug_context| FunctionDebugContext::new(tcx, debug_context, mir, &name, &sig));
+        .map(|debug_context| FunctionDebugContext::new(tcx, debug_context, mir, func_id, &name, &sig));
 
-    // FIXME reuse Function and FunctionBuilder between multiple trans_fn calls
-    let mut bcx = FunctionBuilder::new(Function::with_name_signature(ExternalName::user(0, 0), sig));
+    // Make FunctionBuilder
+    let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+    let mut func_ctx = FunctionBuilderContext::new();
+    let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
 
     // Predefine ebb's
     let start_ebb = bcx.create_ebb();
@@ -51,13 +53,8 @@ pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
         source_info_set: indexmap::IndexSet::new(),
     };
 
-    with_unimpl_span(fx.mir.span, || {
-        crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
-        codegen_fn_content(&mut fx);
-    });
-
-    fx.bcx.seal_all_blocks();
-    let func = fx.bcx.finalize();
+    crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
+    codegen_fn_content(&mut fx);
 
     // Recover all necessary data from fx, before accessing func will prevent future access to it.
     let instance = fx.instance;
@@ -211,7 +208,13 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 cleanup: _,
                 from_hir_call: _,
             } => {
-                crate::abi::codegen_terminator_call(fx, func, args, destination);
+                crate::abi::codegen_terminator_call(
+                    fx,
+                    func,
+                    args,
+                    destination,
+                    bb_data.terminator().source_info.span,
+                );
             }
             TerminatorKind::Resume | TerminatorKind::Abort => {
                 trap_unreachable(fx, "[corruption] Unwinding bb reached.");
@@ -239,6 +242,9 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
             }
         };
     }
+
+    fx.bcx.seal_all_blocks();
+    fx.bcx.finalize();
 }
 
 fn trans_stmt<'tcx>(
@@ -311,33 +317,26 @@ fn trans_stmt<'tcx>(
                                 ty::Bool => {
                                     let val = fx.bcx.ins().uextend(types::I32, val); // WORKAROUND for CraneStation/cranelift#466
                                     let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
-                                    fx.bcx.ins().bint(types::I8, res)
+                                    CValue::by_val(fx.bcx.ins().bint(types::I8, res), layout)
+                                }
+                                ty::Uint(_) | ty::Int(_) => {
+                                    CValue::by_val(fx.bcx.ins().bnot(val), layout)
                                 }
-                                ty::Uint(_) | ty::Int(_) => fx.bcx.ins().bnot(val),
                                 _ => unimplemented!("un op Not for {:?}", layout.ty),
                             }
                         }
                         UnOp::Neg => match layout.ty.kind {
                             ty::Int(_) => {
-                                let clif_ty = fx.clif_type(layout.ty).unwrap();
-                                if clif_ty == types::I128 {
-                                    // FIXME implement it
-                                    crate::trap::trap_unreachable_ret_value(
-                                        fx,
-                                        layout,
-                                        "i128 neg is not yet supported",
-                                    )
-                                    .load_scalar(fx)
-                                } else {
-                                    let zero = fx.bcx.ins().iconst(clif_ty, 0);
-                                    fx.bcx.ins().isub(zero, val)
-                                }
+                                let zero = CValue::const_val(fx, layout.ty, 0);
+                                crate::num::trans_int_binop(fx, BinOp::Sub, zero, operand)
+                            }
+                            ty::Float(_) => {
+                                CValue::by_val(fx.bcx.ins().fneg(val), layout)
                             }
-                            ty::Float(_) => fx.bcx.ins().fneg(val),
                             _ => unimplemented!("un op Neg for {:?}", layout.ty),
                         },
                     };
-                    lval.write_cvalue(fx, CValue::by_val(res, layout));
+                    lval.write_cvalue(fx, res);
                 }
                 Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), operand, ty) => {
                     let layout = fx.layout_of(ty);
@@ -505,7 +504,7 @@ fn is_fat_ptr<'tcx>(
                             to.write_cvalue(fx, operand);
                         }
                     }
-                    _ => unimpl!("shouldn't exist at trans {:?}", to_place_and_rval.1),
+                    _ => unreachable!("shouldn't exist at trans {:?}", to_place_and_rval.1),
                 },
             }
         }
@@ -534,6 +533,12 @@ fn is_fat_ptr<'tcx>(
                 asm_str_style: _,
             } = asm;
             match &*asm_code.as_str() {
+                "" => {
+                    assert_eq!(inputs, &[Name::intern("r")]);
+                    assert!(outputs.is_empty(), "{:?}", outputs);
+
+                    // Black box
+                }
                 "cpuid" | "cpuid\n" => {
                     assert_eq!(inputs, &[Name::intern("{eax}"), Name::intern("{ecx}")]);