diff options
| author | bors <bors@rust-lang.org> | 2025-06-24 01:39:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-24 01:39:19 +0000 |
| commit | 99b18d6c5062449db8e7ccded4cb69b555a239c3 (patch) | |
| tree | 26d624ba1b9891e96ea8688943c4224fe3c1f0fa /compiler/rustc_codegen_ssa/src | |
| parent | 706f244db581212cabf2e619e0113d70999b2bbe (diff) | |
| parent | b7a9cd871c06d97aa7dadbbcf018c6aec24b1ffd (diff) | |
| download | rust-99b18d6c5062449db8e7ccded4cb69b555a239c3.tar.gz rust-99b18d6c5062449db8e7ccded4cb69b555a239c3.zip | |
Auto merge of #142929 - workingjubilee:rollup-4p3ypz1, r=workingjubilee
Rollup of 9 pull requests
Successful merges:
- rust-lang/rust#140985 (Change `core::iter::Fuse`'s `Default` impl to do what its docs say it does)
- rust-lang/rust#141324 (std: sys: random: uefi: Provide rdrand based fallback)
- rust-lang/rust#142134 (Reject unsupported `extern "{abi}"`s consistently in all positions)
- rust-lang/rust#142784 (Add codegen timing section)
- rust-lang/rust#142827 (Move error code explanation removal check into tidy)
- rust-lang/rust#142873 (Don't suggest changing a method inside a expansion)
- rust-lang/rust#142908 (Fix install-template.sh for Solaris tr)
- rust-lang/rust#142922 (Fix comment on NoMangle)
- rust-lang/rust#142923 (fix `-Zmin-function-alignment` on functions without attributes)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/codegen_attrs.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_ssa/src/codegen_attrs.rs b/compiler/rustc_codegen_ssa/src/codegen_attrs.rs index fbcfcaa706c..f769b393528 100644 --- a/compiler/rustc_codegen_ssa/src/codegen_attrs.rs +++ b/compiler/rustc_codegen_ssa/src/codegen_attrs.rs @@ -146,12 +146,6 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs { } } - // Apply the minimum function alignment here, so that individual backends don't have to. - codegen_fn_attrs.alignment = Ord::max( - codegen_fn_attrs.alignment, - tcx.sess.opts.unstable_opts.min_function_alignment, - ); - let Some(Ident { name, .. }) = attr.ident() else { continue; }; @@ -454,6 +448,10 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs { mixed_export_name_no_mangle_lint_state.lint_if_mixed(tcx); + // Apply the minimum function alignment here, so that individual backends don't have to. + codegen_fn_attrs.alignment = + Ord::max(codegen_fn_attrs.alignment, tcx.sess.opts.unstable_opts.min_function_alignment); + let inline_span; (codegen_fn_attrs.inline, inline_span) = if let Some((inline_attr, span)) = find_attr!(attrs, AttributeKind::Inline(i, span) => (*i, *span)) |