Avoid unnecessary allocation.

hkratz · hkratz · commit 1d4972e0e923 · 2021-08-09T12:59:23.000Z
diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs
@@ -150,8 +150,8 @@ fn struct_llfields<'a, 'tcx>(
     } else {
         debug!("struct_llfields: offset: {:?} stride: {:?}", offset, layout.size);
     }
-
-    (result, packed, padding_used.then_some(Box::new(field_remapping)))
+    let field_remapping = if padding_used { Some(Box::new(field_remapping)) } else { None };
+    (result, packed, field_remapping)
 }
 
 impl<'a, 'tcx> CodegenCx<'a, 'tcx> {

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ fn struct_llfields<'a, 'tcx>(`
`150`	`150`	`} else {`
`151`	`151`	`debug!("struct_llfields: offset: {:?} stride: {:?}", offset, layout.size);`
`152`	`152`	`}`
`153`		`-`
`154`		`- (result, packed, padding_used.then_some(Box::new(field_remapping)))`
	`153`	`+ let field_remapping = if padding_used { Some(Box::new(field_remapping)) } else { None };`
	`154`	`+ (result, packed, field_remapping)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`impl<'a, 'tcx> CodegenCx<'a, 'tcx> {`