let mir = tcx.instance_mir(instance.def);
// Step 2. Declare function
- let (name, sig) = get_function_name_and_sig(tcx, instance);
+ let (name, sig) = get_function_name_and_sig(tcx, instance, false);
let func_id = cx.module
.declare_function(&name, linkage, &sig)
.unwrap();
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(..) => {
- fx.tcx.sess.warn("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");
- }
};
}
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);
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::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(_))
};
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_scalar(fx);
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!(),
- },
+ ty::Slice(_elem_ty) => {
+ place.to_addr_maybe_unsized(fx).1.expect("Length metadata for slice place")
+ }
_ => bug!("Rvalue::Len({:?})", place),
}
}
// 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)
}
}
projects / rust.git / blobdiff