Commit a123a36

committed

centralize -Zmin-function-alignment logic

1 parent 6d0c9e2 commit a123a36Copy full SHA for a123a36

File tree

+10

-17

lines changed

+10

-17

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -491,11 +491,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(`
`491`	`491`	`let allocated_pointer = AttributeKind::AllocatedPointer.create_attr(cx.llcx);`
`492`	`492`	`attributes::apply_to_llfn(llfn, AttributePlace::Argument(0), &[allocated_pointer]);`
`493`	`493`	`}`
`494`		- // function alignment can be set globally with the `-Zmin-function-alignment=<n>` flag;
`495`		- // the alignment from a `#[repr(align(<n>))]` is used if it specifies a higher alignment.
`496`		`- if let Some(align) =`
`497`		`- Ord::max(cx.tcx.sess.opts.unstable_opts.min_function_alignment, codegen_fn_attrs.alignment)`
`498`		`- {`
	`494`	`+ if let Some(align) = codegen_fn_attrs.alignment {`
`499`	`495`	`llvm::set_alignment(llfn, align);`
`500`	`496`	`}`
`501`	`497`	`if let Some(backchain) = backchain_attr(cx) {`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,12 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ // Apply the minimum function alignment here, so that individual backends don't have to.`
	`130`	`+ codegen_fn_attrs.alignment = Ord::max(`
	`131`	`+ codegen_fn_attrs.alignment,`
	`132`	`+ tcx.sess.opts.unstable_opts.min_function_alignment,`
	`133`	`+ );`
	`134`	`+`
`129`	`135`	`let Some(Ident { name, .. }) = attr.ident() else {`
`130`	`136`	`continue;`
`131`	`137`	`};`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,8 @@ fn prefix_and_suffix<'tcx>(`
`131`	`131`	`let attrs = tcx.codegen_fn_attrs(instance.def_id());`
`132`	`132`	`let link_section = attrs.link_section.map(\|symbol\| symbol.as_str().to_string());`
`133`	`133`
`134`		- // function alignment can be set globally with the `-Zmin-function-alignment=<n>` flag;
`135`		- // the alignment from a `#[repr(align(<n>))]` is used if it specifies a higher alignment.
`136`		`- // if no alignment is specified, an alignment of 4 bytes is used.`
`137`		`- let min_function_alignment = tcx.sess.opts.unstable_opts.min_function_alignment;`
`138`		`- let align_bytes =`
`139`		`- Ord::max(min_function_alignment, attrs.alignment).map(\|a\| a.bytes()).unwrap_or(4);`
	`134`	`+ // If no alignment is specified, an alignment of 4 bytes is used.`
	`135`	`+ let align_bytes = attrs.alignment.map(\|a\| a.bytes()).unwrap_or(4);`
`140`	`136`
`141`	`137`	// In particular, `.arm` can also be written `.code 32` and `.thumb` as `.code 16`.
`142`	`138`	`let (arch_prefix, arch_suffix) = if is_arm {`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -877,12 +877,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {`
`877`	`877`	`if let Some(fn_val) = self.get_fn_alloc(id) {`
`878`	`878`	`let align = match fn_val {`
`879`	`879`	`FnVal::Instance(instance) => {`
`880`		- // Function alignment can be set globally with the `-Zmin-function-alignment=<n>` flag;
`881`		- // the alignment from a `#[repr(align(<n>))]` is used if it specifies a higher alignment.
`882`		`- let fn_align = self.tcx.codegen_fn_attrs(instance.def_id()).alignment;`
`883`		`- let global_align = self.tcx.sess.opts.unstable_opts.min_function_alignment;`
`884`		`-`
`885`		`- Ord::max(global_align, fn_align).unwrap_or(Align::ONE)`
	`880`	`+ self.tcx.codegen_fn_attrs(instance.def_id()).alignment.unwrap_or(Align::ONE)`
`886`	`881`	`}`
`887`	`882`	`// Machine-specific extra functions currently do not support alignment restrictions.`
`888`	`883`	`FnVal::Other(_) => Align::ONE,`

Comments

(0)