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();
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;
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.");
}
};
}
+
+ fx.bcx.seal_all_blocks();
+ fx.bcx.finalize();
}
fn trans_stmt<'tcx>(
let place = trans_place(fx, place);
crate::discriminant::codegen_set_discriminant(fx, place, *variant_index);
}
- StatementKind::Assign(to_place, rval) => {
- 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);
let val = operand.load_scalar(fx);
let res = match un_op {
UnOp::Not => {
- match layout.ty.sty {
+ match layout.ty.kind {
ty::Bool => {
let val = fx.bcx.ins().uextend(types::I32, val); // WORKAROUND for CraneStation/cranelift#466
let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
- fx.bcx.ins().bint(types::I8, res)
+ CValue::by_val(fx.bcx.ins().bint(types::I8, res), layout)
+ }
+ ty::Uint(_) | ty::Int(_) => {
+ CValue::by_val(fx.bcx.ins().bnot(val), layout)
}
- ty::Uint(_) | ty::Int(_) => fx.bcx.ins().bnot(val),
_ => unimplemented!("un op Not for {:?}", layout.ty),
}
}
- UnOp::Neg => match layout.ty.sty {
+ UnOp::Neg => match layout.ty.kind {
ty::Int(_) => {
- let clif_ty = fx.clif_type(layout.ty).unwrap();
- 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);
match fx
.monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx))
- .sty
+ .kind
{
ty::FnDef(def_id, substs) => {
let func_ref = fx.get_function_ref(
Rvalue::Cast(CastKind::Misc, operand, to_ty) => {
let operand = trans_operand(fx, operand);
let from_ty = operand.layout().ty;
+ let to_ty = fx.monomorphize(to_ty);
fn is_fat_ptr<'tcx>(
fx: &FunctionCx<'_, 'tcx, impl Backend>,
|ty::TypeAndMut {
ty: pointee_ty,
mutbl: _,
- }| {
- fx.layout_of(pointee_ty).is_unsized()
- },
+ }| has_ptr_meta(fx.tcx, pointee_ty),
)
.unwrap_or(false)
}
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 {
+ match to_ty.kind {
ty::Uint(_) | ty::Int(_) => {}
_ => unreachable!("cast adt {} -> {}", from_ty, to_ty),
}
}
Rvalue::Cast(CastKind::Pointer(PointerCast::ClosureFnPointer(_)), operand, _ty) => {
let operand = trans_operand(fx, operand);
- match operand.layout().ty.sty {
+ match operand.layout().ty.kind {
ty::Closure(def_id, substs) => {
let instance = Instance::resolve_closure(
fx.tcx,
to.write_cvalue(fx, operand);
}
}
- _ => unimpl!("shouldn't exist at trans {:?}", rval),
+ _ => unreachable!("shouldn't exist at trans {:?}", to_place_and_rval.1),
},
}
}
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}")]);
fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
place: CPlace<'tcx>,
) -> Value {
- match place.layout().ty.sty {
+ match place.layout().ty.kind {
ty::Array(_elem_ty, len) => {
let len = crate::constant::force_eval_const(fx, len)
.eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64;
fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
place: &Place<'tcx>,
) -> CPlace<'tcx> {
- let base = match &place.base {
+ let mut cplace = match &place.base {
PlaceBase::Local(local) => fx.get_local_place(*local),
PlaceBase::Static(static_) => match static_.kind {
StaticKind::Static => {
},
};
- trans_place_projection(fx, base, &place.projection)
-}
-
-pub fn trans_place_projection<'tcx>(
- fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
- base: CPlace<'tcx>,
- projection: &Option<Box<Projection<'tcx>>>,
-) -> CPlace<'tcx> {
- let projection = if let Some(projection) = projection {
- projection
- } else {
- return base;
- };
-
- let base = trans_place_projection(fx, base, &projection.base);
-
- match projection.elem {
- ProjectionElem::Deref => base.place_deref(fx),
- ProjectionElem::Field(field, _ty) => base.place_field(fx, field),
- ProjectionElem::Index(local) => {
- let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
- base.place_index(fx, index)
- }
- ProjectionElem::ConstantIndex {
- offset,
- min_length: _,
- from_end,
- } => {
- let index = if !from_end {
- fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
- } else {
- let len = codegen_array_len(fx, base);
- fx.bcx.ins().iadd_imm(len, -(offset as i64))
- };
- base.place_index(fx, index)
- }
- ProjectionElem::Subslice { from, to } => {
- // These indices are generated by slice patterns.
- // slice[from:-to] in Python terms.
-
- match base.layout().ty.sty {
- ty::Array(elem_ty, len) => {
- let elem_layout = fx.layout_of(elem_ty);
- let ptr = base.to_addr(fx);
- let len = crate::constant::force_eval_const(fx, len)
- .eval_usize(fx.tcx, ParamEnv::reveal_all());
- CPlace::for_addr(
- fx.bcx
- .ins()
- .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
- fx.layout_of(fx.tcx.mk_array(elem_ty, len - from as u64 - to as u64)),
- )
- }
- ty::Slice(elem_ty) => {
- let elem_layout = fx.layout_of(elem_ty);
- let (ptr, len) = base.to_addr_maybe_unsized(fx);
- let len = len.unwrap();
- CPlace::for_addr_with_extra(
- fx.bcx
- .ins()
- .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
- fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64)),
- base.layout(),
- )
+ for elem in &*place.projection {
+ match *elem {
+ PlaceElem::Deref => {
+ cplace = cplace.place_deref(fx);
+ }
+ PlaceElem::Field(field, _ty) => {
+ cplace = cplace.place_field(fx, field);
+ }
+ PlaceElem::Index(local) => {
+ let index = fx.get_local_place(local).to_cvalue(fx).load_scalar(fx);
+ cplace = cplace.place_index(fx, index);
+ }
+ PlaceElem::ConstantIndex {
+ offset,
+ min_length: _,
+ from_end,
+ } => {
+ let index = if !from_end {
+ fx.bcx.ins().iconst(fx.pointer_type, offset as i64)
+ } else {
+ let len = codegen_array_len(fx, cplace);
+ fx.bcx.ins().iadd_imm(len, -(offset as i64))
+ };
+ cplace = cplace.place_index(fx, index);
+ }
+ PlaceElem::Subslice { from, to } => {
+ // These indices are generated by slice patterns.
+ // slice[from:-to] in Python terms.
+
+ match cplace.layout().ty.kind {
+ ty::Array(elem_ty, len) => {
+ let elem_layout = fx.layout_of(elem_ty);
+ let ptr = cplace.to_addr(fx);
+ let len = crate::constant::force_eval_const(fx, len)
+ .eval_usize(fx.tcx, ParamEnv::reveal_all());
+ cplace = CPlace::for_addr(
+ fx.bcx
+ .ins()
+ .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
+ fx.layout_of(fx.tcx.mk_array(elem_ty, len - from as u64 - to as u64)),
+ );
+ }
+ ty::Slice(elem_ty) => {
+ let elem_layout = fx.layout_of(elem_ty);
+ let (ptr, len) = cplace.to_addr_maybe_unsized(fx);
+ let len = len.unwrap();
+ cplace = CPlace::for_addr_with_extra(
+ fx.bcx
+ .ins()
+ .iadd_imm(ptr, elem_layout.size.bytes() as i64 * from as i64),
+ fx.bcx.ins().iadd_imm(len, -(from as i64 + to as i64)),
+ cplace.layout(),
+ );
+ }
+ _ => unreachable!(),
}
- _ => unreachable!(),
+ }
+ PlaceElem::Downcast(_adt_def, variant) => {
+ cplace = cplace.downcast_variant(fx, variant);
}
}
- ProjectionElem::Downcast(_adt_def, variant) => base.downcast_variant(fx, variant),
}
+
+ cplace
}
pub fn trans_operand<'tcx>(
projects / rust.git / blobdiff