}
}
-pub fn trans_mono_item<'a, 'tcx: 'a>(
- tcx: TyCtxt<'a, 'tcx, 'tcx>,
- module: &mut Module<impl Backend>,
- caches: &mut Caches<'tcx>,
- ccx: &mut crate::constant::ConstantCx,
+pub fn trans_mono_item<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
+ cx: &mut crate::CodegenCx<'a, 'clif, 'tcx, B>,
mono_item: MonoItem<'tcx>,
+ linkage: Linkage,
) {
+ let tcx = cx.tcx;
match mono_item {
MonoItem::Fn(inst) => {
- let _inst_guard = PrintOnPanic(|| format!("{:?}", inst));
+ let _inst_guard =
+ PrintOnPanic(|| format!("{:?} {}", inst, tcx.symbol_name(inst).as_str()));
+ debug_assert!(!inst.substs.needs_infer());
let _mir_guard = PrintOnPanic(|| {
match inst.def {
InstanceDef::Item(_)
}
});
- trans_fn(tcx, module, ccx, caches, inst);
+ trans_fn(cx, inst, linkage);
}
MonoItem::Static(def_id) => {
- crate::constant::codegen_static(ccx, def_id);
+ crate::constant::codegen_static(&mut cx.ccx, def_id);
}
MonoItem::GlobalAsm(node_id) => tcx
.sess
}
}
-fn trans_fn<'a, 'tcx: 'a>(
- tcx: TyCtxt<'a, 'tcx, 'tcx>,
- module: &mut Module<impl Backend>,
- constants: &mut crate::constant::ConstantCx,
- caches: &mut Caches<'tcx>,
+fn trans_fn<'a, 'clif, 'tcx: 'a, B: Backend + 'static>(
+ cx: &mut crate::CodegenCx<'a, 'clif, 'tcx, B>,
instance: Instance<'tcx>,
+ linkage: Linkage,
) {
+ let tcx = cx.tcx;
+
// Step 1. Get mir
let mir = tcx.instance_mir(instance.def);
// Step 2. Declare function
- let (name, sig) = get_function_name_and_sig(tcx, instance);
- let func_id = module
- .declare_function(&name, Linkage::Export, &sig)
+ let (name, sig) = get_function_name_and_sig(tcx, instance, false);
+ let func_id = cx.module
+ .declare_function(&name, linkage, &sig)
.unwrap();
+ let mut debug_context = cx.debug_context.as_mut().map(|debug_context| FunctionDebugContext::new(
+ tcx,
+ debug_context,
+ mir,
+ &name,
+ &sig,
+ ));
// Step 3. Make FunctionBuilder
let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
let mut func_ctx = FunctionBuilderContext::new();
- let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut func, &mut func_ctx);
+ let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
// Step 4. Predefine ebb's
let start_ebb = bcx.create_ebb();
}
// Step 5. Make FunctionCx
- let pointer_type = module.target_config().pointer_type();
+ let pointer_type = cx.module.target_config().pointer_type();
+ let clif_comments = crate::pretty_clif::CommentWriter::new(tcx, instance);
+
let mut fx = FunctionCx {
tcx,
- module,
+ module: cx.module,
pointer_type,
+
instance,
mir,
+
bcx,
- param_substs: {
- assert!(!instance.substs.needs_infer());
- instance.substs
- },
ebb_map,
local_map: HashMap::new(),
- comments: HashMap::new(),
- constants,
- caches,
- top_nop: None,
+ clif_comments,
+ constants: &mut cx.ccx,
+ caches: &mut cx.caches,
+ source_info_set: indexmap::IndexSet::new(),
};
// Step 6. Codegen function
- crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
- codegen_fn_content(&mut fx);
+ with_unimpl_span(fx.mir.span, || {
+ crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
+ codegen_fn_content(&mut fx);
+ });
+ let source_info_set = fx.source_info_set.clone();
// Step 7. Write function to file for debugging
- let mut writer = crate::pretty_clif::CommentWriter(fx.comments);
-
- let mut clif = String::new();
- if cfg!(debug_assertions) {
- ::cranelift::codegen::write::decorate_function(&mut writer, &mut clif, &func, None)
- .unwrap();
- let clif_file_name = format!(
- "{}/{}__{}.clif",
- concat!(env!("CARGO_MANIFEST_DIR"), "/target/out/clif"),
- tcx.crate_name(LOCAL_CRATE),
- tcx.symbol_name(instance).as_str(),
- );
- if let Err(e) = ::std::fs::write(clif_file_name, clif.as_bytes()) {
- tcx.sess.warn(&format!("err writing clif file: {:?}", e));
- }
- }
+ #[cfg(debug_assertions)]
+ fx.write_clif_file();
// Step 8. Verify function
- verify_func(tcx, writer, &func);
+ verify_func(tcx, fx.clif_comments, &func);
// Step 9. Define function
- caches.context.func = func;
- module
- .define_function(func_id, &mut caches.context)
+ cx.caches.context.func = func;
+ cx.module
+ .define_function_peek_compiled(func_id, &mut cx.caches.context, |size, context, isa| {
+ debug_context.as_mut().map(|x| x.define(tcx, size, context, isa, &source_info_set));
+ })
.unwrap();
- caches.context.clear();
+ //let module = &mut cx.module;
+ //let caches = &cx.caches;
+ cx.caches.context.clear();
}
fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Function) {
let pretty_error = ::cranelift::codegen::print_errors::pretty_verifier_error(
&func,
None,
- Some(Box::new(writer)),
+ Some(Box::new(&writer)),
err,
);
tcx.sess
fx.bcx.ins().nop();
for stmt in &bb_data.statements {
+ fx.set_debug_loc(stmt.source_info);
trans_stmt(fx, ebb, stmt);
}
- let mut terminator_head = "\n".to_string();
- bb_data
- .terminator()
- .kind
- .fmt_head(&mut terminator_head)
- .unwrap();
- let inst = fx.bcx.func.layout.last_inst(ebb).unwrap();
- fx.add_comment(inst, terminator_head);
+ #[cfg(debug_assertions)]
+ {
+ let mut terminator_head = "\n".to_string();
+ bb_data
+ .terminator()
+ .kind
+ .fmt_head(&mut terminator_head)
+ .unwrap();
+ let inst = fx.bcx.func.layout.last_inst(ebb).unwrap();
+ fx.add_comment(inst, terminator_head);
+ }
+
+ fx.set_debug_loc(bb_data.terminator().source_info);
match &bb_data.terminator().kind {
TerminatorKind::Goto { target } => {
target,
cleanup: _,
} => {
- let cond = trans_operand(fx, cond).load_value(fx);
+ 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);
} else {
fx.bcx.ins().brz(cond, target, &[]);
};
- fx.bcx.ins().trap(TrapCode::User(!0));
+ trap_panic(&mut fx.bcx);
}
TerminatorKind::SwitchInt {
values,
targets,
} => {
- let discr = trans_operand(fx, discr).load_value(fx);
+ 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]);
crate::abi::codegen_terminator_call(fx, func, args, destination);
}
TerminatorKind::Resume | TerminatorKind::Abort | TerminatorKind::Unreachable => {
- fx.bcx.ins().trap(TrapCode::User(!0));
+ trap_unreachable(&mut fx.bcx);
}
TerminatorKind::Yield { .. }
| TerminatorKind::FalseEdges { .. }
| TerminatorKind::FalseUnwind { .. }
- | TerminatorKind::DropAndReplace { .. } => {
+ | TerminatorKind::DropAndReplace { .. }
+ | TerminatorKind::GeneratorDrop => {
bug!("shouldn't exist at trans {:?}", bb_data.terminator());
}
TerminatorKind::Drop {
// we don't actually need to drop anything
} else {
let drop_place = trans_place(fx, location);
- let arg_place = CPlace::temp(
- fx,
- fx.tcx.mk_ref(
- &ty::RegionKind::ReErased,
- TypeAndMut {
- ty,
- mutbl: crate::rustc::hir::Mutability::MutMutable,
- },
- ),
- );
- drop_place.write_place_ref(fx, arg_place);
+ let drop_fn_ty = drop_fn.ty(fx.tcx);
match ty.sty {
ty::Dynamic(..) => {
- unimpl!("Drop for trait object");
+ crate::abi::codegen_drop(fx, drop_place, drop_fn_ty);
}
_ => {
- let drop_fn_ty = drop_fn.ty(fx.tcx);
+ let arg_place = CPlace::new_stack_slot(
+ fx,
+ fx.tcx.mk_ref(
+ &ty::RegionKind::ReErased,
+ TypeAndMut {
+ ty,
+ mutbl: crate::rustc::hir::Mutability::MutMutable,
+ },
+ ),
+ );
+ drop_place.write_place_ref(fx, arg_place);
let arg_value = arg_place.to_cvalue(fx);
crate::abi::codegen_call_inner(
fx,
);
}
}
- /*
- let (args1, args2);
- /*let mut args = if let Some(llextra) = place.llextra {
- args2 = [place.llval, llextra];
- &args2[..]
- } else {
- args1 = [place.llval];
- &args1[..]
- };*/
- let (drop_fn, fn_ty) = match ty.sty {
- ty::Dynamic(..) => {
- let fn_ty = drop_fn.ty(bx.cx.tcx);
- let sig = common::ty_fn_sig(bx.cx, fn_ty);
- let sig = bx.tcx().normalize_erasing_late_bound_regions(
- ty::ParamEnv::reveal_all(),
- &sig,
- );
- let fn_ty = FnType::new_vtable(bx.cx, sig, &[]);
- let vtable = args[1];
- args = &args[..1];
- (meth::DESTRUCTOR.get_fn(&bx, vtable, &fn_ty), fn_ty)
- }
- _ => {
- let value = place.to_cvalue(fx);
- (callee::get_fn(bx.cx, drop_fn),
- FnType::of_instance(bx.cx, &drop_fn))
- }
- };
- do_call(self, bx, fn_ty, drop_fn, args,
- Some((ReturnDest::Nothing, target)),
- unwind);*/
}
let target_ebb = fx.get_ebb(*target);
fx.bcx.ins().jump(target_ebb, &[]);
}
- TerminatorKind::GeneratorDrop => {
- unimplemented!("terminator GeneratorDrop");
- }
};
}
) {
let _print_guard = PrintOnPanic(|| format!("stmt {:?}", stmt));
+ fx.set_debug_loc(stmt.source_info);
+
+ #[cfg(debug_assertions)]
match &stmt.kind {
StatementKind::StorageLive(..) | StatementKind::StorageDead(..) => {} // Those are not very useful
_ => {
if *variant_index != dataful_variant {
let niche = place.place_field(fx, mir::Field::new(0));
//let niche_llty = niche.layout.immediate_llvm_type(bx.cx);
- let niche_value = ((variant_index - *niche_variants.start()) as u128)
- .wrapping_add(niche_start);
+ 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)
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),
};
lval.write_cvalue(fx, res);
Rvalue::UnaryOp(un_op, operand) => {
let operand = trans_operand(fx, operand);
let layout = operand.layout();
- let val = operand.load_value(fx);
+ let val = operand.load_scalar(fx);
let res = match un_op {
UnOp::Not => {
match layout.ty.sty {
lval.write_cvalue(fx, CValue::ByVal(res, layout));
}
Rvalue::Cast(CastKind::ReifyFnPointer, operand, ty) => {
- let operand = trans_operand(fx, operand);
let layout = fx.layout_of(ty);
- lval.write_cvalue(fx, operand.unchecked_cast_to(layout));
+ match fx.monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx)).sty {
+ ty::FnDef(def_id, substs) => {
+ let func_ref = fx.get_function_ref(
+ Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs).unwrap(),
+ );
+ let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
+ lval.write_cvalue(fx, CValue::ByVal(func_addr, layout));
+ }
+ _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", ty),
+ }
}
Rvalue::Cast(CastKind::UnsafeFnPointer, operand, ty) => {
let operand = trans_operand(fx, operand);
(ty::Ref(..), ty::Ref(..))
| (ty::Ref(..), ty::RawPtr(..))
| (ty::RawPtr(..), ty::Ref(..))
- | (ty::RawPtr(..), ty::RawPtr(..)) => {
+ | (ty::RawPtr(..), ty::RawPtr(..))
+ | (ty::FnPtr(..), ty::RawPtr(..)) => {
lval.write_cvalue(fx, operand.unchecked_cast_to(dest_layout));
}
- (ty::RawPtr(..), ty::Uint(_)) | (ty::FnPtr(..), ty::Uint(_))
- if to_ty.sty == fx.tcx.types.usize.sty =>
+ (ty::RawPtr(..), ty::Uint(_))
+ | (ty::RawPtr(..), ty::Int(_))
+ | (ty::FnPtr(..), ty::Uint(_))
+ if to_ty.sty == fx.tcx.types.usize.sty
+ || to_ty.sty == fx.tcx.types.isize.sty
+ || fx.clif_type(to_ty).unwrap() == pointer_ty(fx.tcx) =>
{
lval.write_cvalue(fx, operand.unchecked_cast_to(dest_layout));
}
(ty::Uint(_), ty::RawPtr(..)) if from_ty.sty == fx.tcx.types.usize.sty => {
lval.write_cvalue(fx, operand.unchecked_cast_to(dest_layout));
}
+ (ty::Int(_), ty::RawPtr(..)) if from_ty.sty == fx.tcx.types.isize.sty => {
+ lval.write_cvalue(fx, operand.unchecked_cast_to(dest_layout));
+ }
(ty::Char, ty::Uint(_))
| (ty::Uint(_), ty::Char)
| (ty::Uint(_), ty::Int(_))
| (ty::Uint(_), ty::Uint(_)) => {
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
let res = crate::common::clif_intcast(
fx,
from,
lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
}
(ty::Int(_), ty::Int(_)) | (ty::Int(_), ty::Uint(_)) => {
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
let res = crate::common::clif_intcast(
fx,
from,
lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
}
(ty::Float(from_flt), ty::Float(to_flt)) => {
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
let res = match (from_flt, to_flt) {
(FloatTy::F32, FloatTy::F64) => {
fx.bcx.ins().fpromote(types::F64, from)
};
lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
}
+ (ty::Float(_), ty::Int(_)) => {
+ let from = operand.load_scalar(fx);
+ let i_type = fx.clif_type(to_ty).unwrap();
+ let res = fx.bcx.ins().fcvt_to_sint_sat(i_type, from);
+ lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
+ }
+ (ty::Float(_), ty::Uint(_)) => {
+ let from = operand.load_scalar(fx);
+ let i_type = fx.clif_type(to_ty).unwrap();
+ let res = fx.bcx.ins().fcvt_to_uint_sat(i_type, from);
+ lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
+ }
(ty::Int(_), ty::Float(_)) => {
let from_ty = fx.clif_type(from_ty).unwrap();
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
// FIXME missing encoding for fcvt_from_sint.f32.i8
let from = if from_ty == types::I8 || from_ty == types::I16 {
fx.bcx.ins().sextend(types::I32, from)
}
(ty::Uint(_), ty::Float(_)) => {
let from_ty = fx.clif_type(from_ty).unwrap();
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
// FIXME missing encoding for fcvt_from_uint.f32.i8
let from = if from_ty == types::I8 || from_ty == types::I16 {
fx.bcx.ins().uextend(types::I32, from)
}
(ty::Bool, ty::Uint(_)) | (ty::Bool, ty::Int(_)) => {
let to_ty = fx.clif_type(to_ty).unwrap();
- let from = operand.load_value(fx);
+ let from = operand.load_scalar(fx);
let res = if to_ty != types::I8 {
fx.bcx.ins().uextend(to_ty, from)
} else {
};
lval.write_cvalue(fx, CValue::ByVal(res, dest_layout));
}
+ (ty::Adt(adt_def, _substs), ty::Uint(_)) | (ty::Adt(adt_def, _substs), ty::Int(_)) if adt_def.is_enum() => {
+ let discr = trans_get_discriminant(fx, operand, fx.layout_of(to_ty));
+ lval.write_cvalue(fx, discr);
+ }
_ => unimpl!("rval misc {:?} {:?}", from_ty, to_ty),
}
}
Rvalue::Len(place) => {
let place = trans_place(fx, place);
let usize_layout = fx.layout_of(fx.tcx.types.usize);
- let len = match place.layout().ty.sty {
- ty::Array(_elem_ty, len) => {
- let len = crate::constant::force_eval_const(fx, len)
- .unwrap_usize(fx.tcx) as i64;
- fx.bcx.ins().iconst(fx.pointer_type, len)
- }
- ty::Slice(_elem_ty) => match place {
- CPlace::Addr(_, size, _) => size.unwrap(),
- CPlace::Var(_, _) => unreachable!(),
- },
- _ => bug!("Rvalue::Len({:?})", place),
- };
+ let len = codegen_array_len(fx, place);
lval.write_cvalue(fx, CValue::ByVal(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 (size, align) = fx.layout_of(content_ty).size_and_align();
- let llsize = fx.bcx.ins().iconst(usize_type, size.bytes() as i64);
- let llalign = fx.bcx.ins().iconst(usize_type, align.abi() as i64);
+ let layout = fx.layout_of(content_ty);
+ let llsize = fx.bcx.ins().iconst(usize_type, layout.size.bytes() as i64);
+ let llalign = fx
+ .bcx
+ .ins()
+ .iconst(usize_type, layout.align.abi.bytes() as i64);
let box_layout = fx.layout_of(fx.tcx.mk_box(content_ty));
// Allocate space:
| StatementKind::StorageDead(_)
| StatementKind::Nop
| StatementKind::FakeRead(..)
- | StatementKind::EndRegion(_)
| StatementKind::Retag { .. }
| StatementKind::AscribeUserType(..) => {}
}
}
+fn codegen_array_len<'a, 'tcx: 'a>(
+ fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+ place: CPlace<'tcx>,
+) -> Value {
+ match place.layout().ty.sty {
+ ty::Array(_elem_ty, len) => {
+ let len = crate::constant::force_eval_const(fx, len).unwrap_usize(fx.tcx) as i64;
+ fx.bcx.ins().iconst(fx.pointer_type, len)
+ }
+ ty::Slice(_elem_ty) => {
+ place.to_addr_maybe_unsized(fx).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>,
value: CValue<'tcx>,
let layout = value.layout();
if layout.abi == layout::Abi::Uninhabited {
- fx.bcx.ins().trap(TrapCode::User(!0));
+ trap_unreachable(&mut fx.bcx);
}
match layout.variants {
layout::Variants::Single { index } => {
- let discr_val = layout.ty.ty_adt_def().map_or(index as u128, |def| {
- def.discriminant_for_variant(fx.tcx, index).val
- });
+ let discr_val = layout
+ .ty
+ .ty_adt_def()
+ .map_or(index.as_u32() as u128, |def| {
+ def.discriminant_for_variant(fx.tcx, index).val
+ });
return CValue::const_val(fx, dest_layout.ty, discr_val as u64 as i64);
}
layout::Variants::Tagged { .. } | layout::Variants::NicheFilling { .. } => {}
let discr = value.value_field(fx, mir::Field::new(0));
let discr_ty = discr.layout().ty;
- let lldiscr = discr.load_value(fx);
+ let lldiscr = discr.load_scalar(fx);
match layout.variants {
layout::Variants::Single { .. } => bug!(),
layout::Variants::Tagged { ref tag, .. } => {
let if_true = fx
.bcx
.ins()
- .iconst(dest_clif_ty, *niche_variants.start() as u64 as i64);
+ .iconst(dest_clif_ty, niche_variants.start().as_u32() as i64);
let if_false = fx
.bcx
.ins()
- .iconst(dest_clif_ty, dataful_variant as u64 as i64);
+ .iconst(dest_clif_ty, dataful_variant.as_u32() as i64);
let val = fx.bcx.ins().select(b, if_true, if_false);
return CValue::ByVal(val, dest_layout);
} else {
// Rebase from niche values to discriminant values.
- let delta = niche_start.wrapping_sub(*niche_variants.start() as u128);
+ 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 u64 as i64,
+ 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 u64 as i64);
+ .iconst(dest_clif_ty, dataful_variant.as_u32() as i64);
let val = fx.bcx.ins().select(b, if_true, if_false);
return CValue::ByVal(val, dest_layout);
}
assert_eq!($fx.tcx.types.bool, $ret_ty);
let ret_layout = $fx.layout_of($ret_ty);
- // TODO HACK no encoding for icmp.i8
- use crate::common::clif_intcast;
- let (lhs, rhs) = (
- clif_intcast($fx, $lhs, types::I64, $signed),
- clif_intcast($fx, $rhs, types::I64, $signed),
- );
- let b = $fx.bcx.ins().icmp(IntCC::$cc, lhs, rhs);
-
+ let b = $fx.bcx.ins().icmp(IntCC::$cc, $lhs, $rhs);
CValue::ByVal($fx.bcx.ins().bint(types::I8, b), ret_layout)
}};
(@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, fcmp($cc:ident)) => {{
$var:ident ($sign:pat) $name:tt $( ( $($next:tt)* ) )? ;
)*
) => {{
- let lhs = $lhs.load_value($fx);
- let rhs = $rhs.load_value($fx);
+ 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)* ) )?),
);
}
- let lhs = in_lhs.load_value(fx);
- let rhs = in_rhs.load_value(fx);
+ let lhs = in_lhs.load_scalar(fx);
+ let rhs = in_rhs.load_scalar(fx);
let res = match bin_op {
BinOp::Add => fx.bcx.ins().iadd(lhs, rhs),
BinOp::Sub => fx.bcx.ins().isub(lhs, rhs),
// TODO: check for overflow
let has_overflow = fx.bcx.ins().iconst(types::I8, 0);
- let out_place = CPlace::temp(fx, out_ty);
+ let out_place = CPlace::new_stack_slot(fx, out_ty);
let out_layout = out_place.layout();
out_place.write_cvalue(fx, CValue::ByValPair(res, has_overflow, out_layout));
rhs: CValue<'tcx>,
ret_ty: Ty<'tcx>,
) -> CValue<'tcx> {
- match lhs.layout().ty.sty {
- ty::RawPtr(TypeAndMut { ty, mutbl: _ }) => {
- if ty.is_sized(fx.tcx.at(DUMMY_SP), ParamEnv::reveal_all()) {
- 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 (_) iadd;
- }
- } else {
- let lhs = lhs.load_value_pair(fx).0;
- let rhs = rhs.load_value_pair(fx).0;
- let res = match bin_op {
- BinOp::Eq => fx.bcx.ins().icmp(IntCC::Equal, lhs, rhs),
- BinOp::Ne => fx.bcx.ins().icmp(IntCC::NotEqual, lhs, rhs),
- _ => unimplemented!(
- "trans_ptr_binop({:?}, <fat ptr>, <fat ptr>) not implemented",
- bin_op
- ),
- };
+ let not_fat = match lhs.layout().ty.sty {
+ ty::RawPtr(TypeAndMut { ty, mutbl: _ }) => ty.is_sized(fx.tcx.at(DUMMY_SP), ParamEnv::reveal_all()),
+ ty::FnPtr(..) => true,
+ _ => bug!("trans_ptr_binop on non ptr"),
+ };
+ if not_fat {
+ if let BinOp::Offset = bin_op {
+ let (base, offset) = (lhs, rhs.load_scalar(fx));
+ let pointee_ty = base.layout().ty.builtin_deref(true).unwrap().ty;
+ let pointee_size = fx.layout_of(pointee_ty).size.bytes();
+ let ptr_diff = fx.bcx.ins().imul_imm(offset, pointee_size as i64);
+ let base_val = base.load_scalar(fx);
+ let res = fx.bcx.ins().iadd(base_val, ptr_diff);
+ return CValue::ByVal(res, base.layout());
+ }
- assert_eq!(fx.tcx.types.bool, ret_ty);
- let ret_layout = fx.layout_of(ret_ty);
- CValue::ByVal(fx.bcx.ins().bint(types::I8, res), ret_layout)
- }
+ 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
}
- _ => bug!("trans_ptr_binop on non ptr"),
+ } else {
+ let (lhs_ptr, lhs_extra) = lhs.load_value_pair(fx);
+ let (rhs_ptr, rhs_extra) = rhs.load_value_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)
+ }
+ _ => unimplemented!(
+ "trans_ptr_binop({:?}, <fat ptr>, <fat ptr>) not implemented",
+ bin_op
+ ),
+ };
+
+ assert_eq!(fx.tcx.types.bool, ret_ty);
+ let ret_layout = fx.layout_of(ret_ty);
+ CValue::ByVal(fx.bcx.ins().bint(types::I8, res), ret_layout)
}
}
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_value(fx);
+ 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: false,
- } => unimpl!(
- "projection const index {:?} offset {:?} not from end",
- projection.base,
- offset
- ),
- ProjectionElem::ConstantIndex {
- offset,
- min_length: _,
- from_end: true,
- } => unimpl!(
- "projection const index {:?} offset {:?} from end",
- projection.base,
- offset
- ),
+ 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 } => unimpl!(
"projection subslice {:?} from {} to {}",
projection.base,
projects / rust.git / blobdiff