From 99213ae164e42966f8dd37fe9f64a1e138fdf500 Mon Sep 17 00:00:00 2001 From: Scott McMurray Date: Sat, 11 May 2024 15:26:49 -0700 Subject: Make `index_by_increasing_offset` return one item for primitives --- compiler/rustc_codegen_ssa/src/mir/rvalue.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'compiler/rustc_codegen_ssa/src') diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs index b764ea6a4c6..936ed41a294 100644 --- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs +++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs @@ -18,7 +18,6 @@ use rustc_span::{Span, DUMMY_SP}; use rustc_target::abi::{self, FieldIdx, FIRST_VARIANT}; use arrayvec::ArrayVec; -use either::Either; impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { #[instrument(level = "trace", skip(self, bx))] @@ -698,24 +697,16 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { } mir::Rvalue::Use(ref operand) => self.codegen_operand(bx, operand), mir::Rvalue::Repeat(..) => bug!("{rvalue:?} in codegen_rvalue_operand"), - mir::Rvalue::Aggregate(ref kind, ref fields) => { + mir::Rvalue::Aggregate(_, ref fields) => { let ty = rvalue.ty(self.mir, self.cx.tcx()); let ty = self.monomorphize(ty); let layout = self.cx.layout_of(ty); - let field_indices = if let mir::AggregateKind::RawPtr(..) = **kind { - // `index_by_increasing_offset` gives an empty iterator for primitives - Either::Left([0_usize, 1_usize].iter().copied()) - } else { - Either::Right(layout.fields.index_by_increasing_offset()) - }; - debug_assert_eq!(field_indices.len(), fields.len()); - // `rvalue_creates_operand` has arranged that we only get here if // we can build the aggregate immediate from the field immediates. let mut inputs = ArrayVec::::new(); let mut input_scalars = ArrayVec::::new(); - for field_idx in field_indices { + for field_idx in layout.fields.index_by_increasing_offset() { let field_idx = FieldIdx::from_usize(field_idx); let op = self.codegen_operand(bx, &fields[field_idx]); let values = op.val.immediates_or_place().left_or_else(|p| { -- cgit 1.4.1-3-g733a5