Skip to content

Commit 8b447bc

Browse files
bjorn3bjorn3
committed
Sync from rust af06dce 
2 parents c4b3794 + 446650c commit 8b447bc

File tree

9 files changed

+37
-24
lines changed

9 files changed

+37
-24
lines changed

‎src/abi/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ pub(crate) fn codegen_fn_prelude<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, start_
327327
ArgKind::Spread(params) => {
328328
for (i, param) in params.into_iter().enumerate() {
329329
if let Some(param) = param {
330-
place.place_field(fx, mir::Field::new(i)).write_cvalue(fx, param);
330+
place.place_field(fx, FieldIdx::new(i)).write_cvalue(fx, param);
331331
}
332332
}
333333
}
@@ -460,7 +460,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
460460
args.push(self_arg);
461461
for i in 0..tupled_arguments.len() {
462462
args.push(CallArgument {
463-
value: pack_arg.value.value_field(fx, mir::Field::new(i)),
463+
value: pack_arg.value.value_field(fx, FieldIdx::new(i)),
464464
is_owned: pack_arg.is_owned,
465465
});
466466
}

‎src/base.rs

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
335335
TerminatorKind::Return => {
336336
crate::abi::codegen_return(fx);
337337
}
338-
TerminatorKind::Assert { cond, expected, msg, target, cleanup: _ } => {
338+
TerminatorKind::Assert { cond, expected, msg, target, unwind: _ } => {
339339
if !fx.tcx.sess.overflow_checks() && msg.is_optional_overflow_check() {
340340
let target = fx.get_block(*target);
341341
fx.bcx.ins().jump(target, &[]);
@@ -369,6 +369,18 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
369369
source_info.span,
370370
);
371371
}
372+
AssertKind::MisalignedPointerDereference { ref required, ref found } => {
373+
let required = codegen_operand(fx, required).load_scalar(fx);
374+
let found = codegen_operand(fx, found).load_scalar(fx);
375+
let location = fx.get_caller_location(source_info).load_scalar(fx);
376+
377+
codegen_panic_inner(
378+
fx,
379+
rustc_hir::LangItem::PanicBoundsCheck,
380+
&[required, found, location],
381+
source_info.span,
382+
);
383+
}
372384
_ => {
373385
let msg_str = msg.description();
374386
codegen_panic(fx, msg_str, source_info);
@@ -428,7 +440,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
428440
destination,
429441
target,
430442
fn_span,
431-
cleanup: _,
443+
unwind: _,
432444
from_hir_call: _,
433445
} => {
434446
fx.tcx.prof.generic_activity("codegen call").run(|| {
@@ -448,7 +460,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
448460
options,
449461
destination,
450462
line_spans: _,
451-
cleanup: _,
463+
unwind: _,
452464
} => {
453465
if options.contains(InlineAsmOptions::MAY_UNWIND) {
454466
fx.tcx.sess.span_fatal(
@@ -466,7 +478,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
466478
*destination,
467479
);
468480
}
469-
TerminatorKind::Abort => {
481+
TerminatorKind::Terminate => {
470482
codegen_panic_cannot_unwind(fx, source_info);
471483
}
472484
TerminatorKind::Resume => {
@@ -784,14 +796,15 @@ fn codegen_stmt<'tcx>(
784796
if active_field_index.is_some() {
785797
assert_eq!(operands.len(), 1);
786798
}
787-
for (i, operand) in operands.iter().enumerate() {
799+
for (i, operand) in operands.iter_enumerated() {
788800
let operand = codegen_operand(fx, operand);
789801
let field_index = active_field_index.unwrap_or(i);
790802
let to = if let mir::AggregateKind::Array(_) = **kind {
791-
let index = fx.bcx.ins().iconst(fx.pointer_type, field_index as i64);
803+
let array_index = i64::from(field_index.as_u32());
804+
let index = fx.bcx.ins().iconst(fx.pointer_type, array_index);
792805
variant_dest.place_index(fx, index)
793806
} else {
794-
variant_dest.place_field(fx, mir::Field::new(field_index))
807+
variant_dest.place_field(fx, field_index)
795808
};
796809
to.write_cvalue(fx, operand);
797810
}

‎src/constant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
551551
TerminatorKind::Goto { .. }
552552
| TerminatorKind::SwitchInt { .. }
553553
| TerminatorKind::Resume
554-
| TerminatorKind::Abort
554+
| TerminatorKind::Terminate
555555
| TerminatorKind::Return
556556
| TerminatorKind::Unreachable
557557
| TerminatorKind::Drop { .. }

‎src/discriminant.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub(crate) fn codegen_set_discriminant<'tcx>(
2626
tag_encoding: TagEncoding::Direct,
2727
variants: _,
2828
} => {
29-
let ptr = place.place_field(fx, mir::Field::new(tag_field));
29+
let ptr = place.place_field(fx, FieldIdx::new(tag_field));
3030
let to = layout.ty.discriminant_for_variant(fx.tcx, variant_index).unwrap().val;
3131
let to = if ptr.layout().abi.is_signed() {
3232
ty::ScalarInt::try_from_int(
@@ -47,7 +47,7 @@ pub(crate) fn codegen_set_discriminant<'tcx>(
4747
variants: _,
4848
} => {
4949
if variant_index != untagged_variant {
50-
let niche = place.place_field(fx, mir::Field::new(tag_field));
50+
let niche = place.place_field(fx, FieldIdx::new(tag_field));
5151
let niche_type = fx.clif_type(niche.layout().ty).unwrap();
5252
let niche_value = variant_index.as_u32() - niche_variants.start().as_u32();
5353
let niche_value = (niche_value as u128).wrapping_add(niche_start);
@@ -107,7 +107,7 @@ pub(crate) fn codegen_get_discriminant<'tcx>(
107107
let cast_to = fx.clif_type(dest_layout.ty).unwrap();
108108

109109
// Read the tag/niche-encoded discriminant from memory.
110-
let tag = value.value_field(fx, mir::Field::new(tag_field));
110+
let tag = value.value_field(fx, FieldIdx::new(tag_field));
111111
let tag = tag.load_scalar(fx);
112112

113113
// Decode the discriminant (specifically if it's niche-encoded).

‎src/intrinsics/llvm_x86.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ fn llvm_add_sub<'tcx>(
179179

180180
// c + carry -> c + first intermediate carry or borrow respectively
181181
let int0 = crate::num::codegen_checked_int_binop(fx, bin_op, a, b);
182-
let c = int0.value_field(fx, mir::Field::new(0));
183-
let cb0 = int0.value_field(fx, mir::Field::new(1)).load_scalar(fx);
182+
let c = int0.value_field(fx, FieldIdx::new(0));
183+
let cb0 = int0.value_field(fx, FieldIdx::new(1)).load_scalar(fx);
184184

185185
// c + carry -> c + second intermediate carry or borrow respectively
186186
let cb_in_as_u64 = fx.bcx.ins().uextend(types::I64, cb_in);

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ mod prelude {
8686
self, FloatTy, Instance, InstanceDef, IntTy, ParamEnv, Ty, TyCtxt, TypeAndMut,
8787
TypeFoldable, TypeVisitableExt, UintTy,
8888
};
89-
pub(crate) use rustc_target::abi::{Abi, Scalar, Size, VariantIdx, FIRST_VARIANT};
89+
pub(crate) use rustc_target::abi::{Abi, FieldIdx, Scalar, Size, VariantIdx, FIRST_VARIANT};
9090

9191
pub(crate) use rustc_data_structures::fx::FxHashMap;
9292

‎src/unsize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ pub(crate) fn coerce_unsized_into<'tcx>(
147147
assert_eq!(def_a, def_b);
148148

149149
for i in 0..def_a.variant(FIRST_VARIANT).fields.len() {
150-
let src_f = src.value_field(fx, mir::Field::new(i));
151-
let dst_f = dst.place_field(fx, mir::Field::new(i));
150+
let src_f = src.value_field(fx, FieldIdx::new(i));
151+
let dst_f = dst.place_field(fx, FieldIdx::new(i));
152152

153153
if dst_f.layout().is_zst() {
154154
continue;

‎src/value_and_place.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn codegen_field<'tcx>(
1010
base: Pointer,
1111
extra: Option<Value>,
1212
layout: TyAndLayout<'tcx>,
13-
field: mir::Field,
13+
field: FieldIdx,
1414
) -> (Pointer, TyAndLayout<'tcx>) {
1515
let field_offset = layout.fields.offset(field.index());
1616
let field_layout = layout.field(&*fx, field.index());
@@ -210,7 +210,7 @@ impl<'tcx> CValue<'tcx> {
210210
pub(crate) fn value_field(
211211
self,
212212
fx: &mut FunctionCx<'_, '_, 'tcx>,
213-
field: mir::Field,
213+
field: FieldIdx,
214214
) -> CValue<'tcx> {
215215
let layout = self.1;
216216
match self.0 {
@@ -644,7 +644,7 @@ impl<'tcx> CPlace<'tcx> {
644644
pub(crate) fn place_field(
645645
self,
646646
fx: &mut FunctionCx<'_, '_, 'tcx>,
647-
field: mir::Field,
647+
field: FieldIdx,
648648
) -> CPlace<'tcx> {
649649
let layout = self.layout();
650650

‎src/vtable.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub(crate) fn get_ptr_and_method_ref<'tcx>(
5050
if let Abi::Scalar(_) = arg.layout().abi {
5151
'descend_newtypes: while !arg.layout().ty.is_unsafe_ptr() && !arg.layout().ty.is_ref() {
5252
for i in 0..arg.layout().fields.count() {
53-
let field = arg.value_field(fx, mir::Field::new(i));
53+
let field = arg.value_field(fx, FieldIdx::new(i));
5454
if !field.layout().is_zst() {
5555
// we found the one non-zero-sized field that is allowed
5656
// now find *its* non-zero-sized field, or stop if it's a
@@ -68,9 +68,9 @@ pub(crate) fn get_ptr_and_method_ref<'tcx>(
6868
if ty.is_dyn_star() {
6969
let inner_layout = fx.layout_of(arg.layout().ty.builtin_deref(true).unwrap().ty);
7070
let dyn_star = CPlace::for_ptr(Pointer::new(arg.load_scalar(fx)), inner_layout);
71-
let ptr = dyn_star.place_field(fx, mir::Field::new(0)).to_ptr();
71+
let ptr = dyn_star.place_field(fx, FieldIdx::new(0)).to_ptr();
7272
let vtable =
73-
dyn_star.place_field(fx, mir::Field::new(1)).to_cvalue(fx).load_scalar(fx);
73+
dyn_star.place_field(fx, FieldIdx::new(1)).to_cvalue(fx).load_scalar(fx);
7474
break 'block (ptr, vtable);
7575
}
7676
}

0 commit comments

Comments
 (0)