bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Test: Use smallvec directly instead of boxed.

Browse source
This commit is contained in:
Hans Kratz 2021-08-09 15:42:37 +00:00
parent 1d4972e0e9
commit 02295f464a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/context.rs
View file

@ -103,7 +103,7 @@ pub struct TypeLowering<'ll> {
/// If padding is used the slice maps fields from source order /// If padding is used the slice maps fields from source order
/// to llvm order. /// to llvm order.
pub field_remapping: Option<Box<SmallVec<[u32; 4]>>>, pub field_remapping: Option<SmallVec<[u32; 4]>>,
} }
fn to_llvm_tls_model(tls_model: TlsModel) -> llvm::ThreadLocalMode { fn to_llvm_tls_model(tls_model: TlsModel) -> llvm::ThreadLocalMode {

6
compiler/rustc_codegen_llvm/src/type_of.rs
View file

@ -19,7 +19,7 @@ fn uncached_llvm_type<'a, 'tcx>(
cx: &CodegenCx<'a, 'tcx>, cx: &CodegenCx<'a, 'tcx>,
layout: TyAndLayout<'tcx>, layout: TyAndLayout<'tcx>,
defer: &mut Option<(&'a Type, TyAndLayout<'tcx>)>, defer: &mut Option<(&'a Type, TyAndLayout<'tcx>)>,
field_remapping: &mut Option<Box<SmallVec<[u32; 4]>>>, field_remapping: &mut Option<SmallVec<[u32; 4]>>,
) -> &'a Type { ) -> &'a Type {
match layout.abi { match layout.abi {
Abi::Scalar(_) => bug!("handled elsewhere"), Abi::Scalar(_) => bug!("handled elsewhere"),
@ -94,7 +94,7 @@ fn uncached_llvm_type<'a, 'tcx>(
fn struct_llfields<'a, 'tcx>( fn struct_llfields<'a, 'tcx>(
cx: &CodegenCx<'a, 'tcx>, cx: &CodegenCx<'a, 'tcx>,
layout: TyAndLayout<'tcx>, layout: TyAndLayout<'tcx>,
) -> (Vec<&'a Type>, bool, Option<Box<SmallVec<[u32; 4]>>>) { ) -> (Vec<&'a Type>, bool, Option<SmallVec<[u32; 4]>>) {
debug!("struct_llfields: {:#?}", layout); debug!("struct_llfields: {:#?}", layout);
let field_count = layout.fields.count(); let field_count = layout.fields.count();
@ -150,7 +150,7 @@ fn struct_llfields<'a, 'tcx>(
} else { } else {
debug!("struct_llfields: offset: {:?} stride: {:?}", offset, layout.size); debug!("struct_llfields: offset: {:?} stride: {:?}", offset, layout.size);
} }
let field_remapping = if padding_used { Some(Box::new(field_remapping)) } else { None }; let field_remapping = if padding_used { Some(field_remapping) } else { None };
(result, packed, field_remapping) (result, packed, field_remapping)
} }