dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync from rust 7a3d1a5f3d

This commit is contained in:
bjorn3 2021-09-19 13:43:54 +02:00
parent 4560603b1c 02d3c132ae
commit f12c51f149
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base.rs
View File

@ -726,15 +726,20 @@ fn codegen_stmt<'tcx>(
let ptr = fx.bcx.inst_results(call)[0]; let ptr = fx.bcx.inst_results(call)[0];
lval.write_cvalue(fx, CValue::by_val(ptr, box_layout)); lval.write_cvalue(fx, CValue::by_val(ptr, box_layout));
} }
Rvalue::NullaryOp(NullOp::SizeOf, ty) => { Rvalue::NullaryOp(null_op, ty) => {
assert!( assert!(
lval.layout() lval.layout()
.ty .ty
.is_sized(fx.tcx.at(stmt.source_info.span), ParamEnv::reveal_all()) .is_sized(fx.tcx.at(stmt.source_info.span), ParamEnv::reveal_all())
); );
let ty_size = fx.layout_of(fx.monomorphize(ty)).size.bytes(); let layout = fx.layout_of(fx.monomorphize(ty));
let val = match null_op {
NullOp::SizeOf => layout.size.bytes(),
NullOp::AlignOf => layout.align.abi.bytes(),
NullOp::Box => unreachable!(),
};
let val = let val =
CValue::const_val(fx, fx.layout_of(fx.tcx.types.usize), ty_size.into()); CValue::const_val(fx, fx.layout_of(fx.tcx.types.usize), val.into());
lval.write_cvalue(fx, val); lval.write_cvalue(fx, val);
} }
Rvalue::Aggregate(ref kind, ref operands) => match kind.as_ref() { Rvalue::Aggregate(ref kind, ref operands) => match kind.as_ref() {

2
src/intrinsics/mod.rs
View File

@ -823,7 +823,7 @@ pub(crate) fn codegen_intrinsic_call<'tcx>(
dest.write_cvalue(fx, val); dest.write_cvalue(fx, val);
}; };
pref_align_of | min_align_of | needs_drop | type_id | type_name | variant_count, () { pref_align_of | needs_drop | type_id | type_name | variant_count, () {
let const_val = let const_val =
fx.tcx.const_eval_instance(ParamEnv::reveal_all(), instance, None).unwrap(); fx.tcx.const_eval_instance(ParamEnv::reveal_all(), instance, None).unwrap();
let val = crate::constant::codegen_const_value( let val = crate::constant::codegen_const_value(