nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rustup to rustc 1.39.0-nightly (97e58c0d3 2019-09-20)

Browse Source
This commit is contained in:
bjorn3 2019-09-21 11:30:29 +02:00
parent 2e2c8f8bbf
commit fdfb1eda2c
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/abi/mod.rs
View File

@ -384,7 +384,7 @@ pub fn codegen_terminator_call<'tcx>(
match instance.def {
InstanceDef::Intrinsic(_) => {
crate::intrinsics::codegen_intrinsic_call(fx, def_id, substs, args, destination);
crate::intrinsics::codegen_intrinsic_call(fx, instance, args, destination);
return;
}
InstanceDef::DropGlue(_, None) => {

55
src/intrinsics.rs
View File

@ -1,7 +1,5 @@
use crate::prelude::*;
use rustc::ty::subst::SubstsRef;
macro intrinsic_pat {
(_) => {
_
@ -337,11 +335,13 @@ macro_rules! simd_flt_binop {
pub fn codegen_intrinsic_call<'tcx>(
fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
def_id: DefId,
substs: SubstsRef<'tcx>,
instance: Instance<'tcx>,
args: &[mir::Operand<'tcx>],
destination: Option<(CPlace<'tcx>, BasicBlock)>,
) {
let def_id = instance.def_id();
let substs = instance.substs;
let intrinsic = fx.tcx.item_name(def_id).as_str();
let intrinsic = &intrinsic[..];
@ -368,7 +368,6 @@ pub fn codegen_intrinsic_call<'tcx>(
}
};
let u64_layout = fx.layout_of(fx.tcx.types.u64);
let usize_layout = fx.layout_of(fx.tcx.types.usize);
call_intrinsic_match! {
@ -448,11 +447,6 @@ pub fn codegen_intrinsic_call<'tcx>(
let discr = crate::discriminant::codegen_get_discriminant(fx, val, ret.layout());
ret.write_cvalue(fx, discr);
};
size_of, <T> () {
let size_of = fx.layout_of(T).size.bytes();
let size_of = CValue::const_val(fx, usize_layout.ty, size_of.into());
ret.write_cvalue(fx, size_of);
};
size_of_val, <T> (c ptr) {
let layout = fx.layout_of(T);
let size = if layout.is_unsized() {
@ -467,11 +461,6 @@ pub fn codegen_intrinsic_call<'tcx>(
};
ret.write_cvalue(fx, CValue::by_val(size, usize_layout));
};
min_align_of, <T> () {
let min_align = fx.layout_of(T).align.abi.bytes();
let min_align = CValue::const_val(fx, usize_layout.ty, min_align.into());
ret.write_cvalue(fx, min_align);
};
min_align_of_val, <T> (c ptr) {
let layout = fx.layout_of(T);
let align = if layout.is_unsized() {
@ -486,23 +475,6 @@ pub fn codegen_intrinsic_call<'tcx>(
};
ret.write_cvalue(fx, CValue::by_val(align, usize_layout));
};
pref_align_of, <T> () {
let pref_align = fx.layout_of(T).align.pref.bytes();
let pref_align = CValue::const_val(fx, usize_layout.ty, pref_align.into());
ret.write_cvalue(fx, pref_align);
};
type_id, <T> () {
let type_id = fx.tcx.type_id_hash(T);
let type_id = CValue::const_val(fx, u64_layout.ty, type_id.into());
ret.write_cvalue(fx, type_id);
};
type_name, <T> () {
let type_name = fx.tcx.type_name(T);
let type_name = crate::constant::trans_const_value(fx, type_name);
ret.write_cvalue(fx, type_name);
};
_ if intrinsic.starts_with("unchecked_") || intrinsic == "exact_div", (c x, c y) {
// FIXME trap on overflow
@ -814,15 +786,6 @@ pub fn codegen_intrinsic_call<'tcx>(
let res = CValue::by_val(swap(&mut fx.bcx, arg), fx.layout_of(T));
ret.write_cvalue(fx, res);
};
needs_drop, <T> () {
let needs_drop = if T.needs_drop(fx.tcx, ParamEnv::reveal_all()) {
1
} else {
0
};
let needs_drop = CValue::const_val(fx, fx.tcx.types.bool, needs_drop);
ret.write_cvalue(fx, needs_drop);
};
panic_if_uninhabited, <T> () {
if fx.layout_of(T).abi.is_uninhabited() {
crate::trap::trap_panic(fx, "[panic] Called intrinsic::panic_if_uninhabited for uninhabited type.");
@ -843,6 +806,16 @@ pub fn codegen_intrinsic_call<'tcx>(
dest.write_cvalue(fx, val);
};
size_of | pref_align_of | min_align_of | needs_drop | type_id | type_name, () {
let gid = rustc::mir::interpret::GlobalId {
instance,
promoted: None,
};
let const_val = fx.tcx.const_eval(ParamEnv::reveal_all().and(gid)).unwrap();
let val = crate::constant::trans_const_value(fx, const_val);
ret.write_cvalue(fx, val);
};
_ if intrinsic.starts_with("atomic_fence"), () {};
_ if intrinsic.starts_with("atomic_singlethreadfence"), () {};
_ if intrinsic.starts_with("atomic_load"), (c ptr) {