Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

codegen: better centralize function declaration attribute computation #128679

Merged
merged 1 commit into from
Aug 7, 2024
Merged

codegen: better centralize function declaration attribute computation #128679

merged 1 commit into from
Aug 7, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Aug 5, 2024

For some reason, the codegen backend has two functions that compute which attributes a function declaration gets: apply_attrs_llfn and attributes::from_fn_attrs. They are called in different places, on entirely different layers of abstraction.

To me the code seems cleaner if we centralize this entirely in apply_attrs_llfn, so that's what this PR does.

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2024

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 5, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Aug 5, 2024

Let's get a codegen reviewer.
r? @nikic

@rustbot rustbot assigned nikic and unassigned lcnr Aug 5, 2024
@nikic
Copy link
Contributor

nikic commented Aug 7, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 7, 2024

📌 Commit 5f20658 has been approved by nikic

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 7, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 7, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
@bors
Auto merge of rust-lang#128783 - GuillaumeGomez:rollup-2kvpg7s, r=Gui…
8d00669 
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#128206 (Make create_dll_import_lib easier to implement)
 - rust-lang#128424 (minor `effects` cleanups)
 - rust-lang#128527 (More information for fully-qualified suggestion when there are multiple impls)
 - rust-lang#128656 (Enable msvc for run-make/rust-lld)
 - rust-lang#128683 (bootstrap: clear miri's ui test deps when rustc changes)
 - rust-lang#128700 (Migrate `simd-ffi` `run-make` test to rmake)
 - rust-lang#128753 (Don't arbitrarily choose one upper bound for hidden captured region error message)
 - rust-lang#128757 (Migrate `pgo-gen-lto` `run-make` test to rmake)
 - rust-lang#128758 (Specify a minimum supported version for VxWorks)

Failed merges:

 - rust-lang#128679 (codegen: better centralize function declaration attribute computation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Aug 7, 2024

☔ The latest upstream changes (presumably #128783) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 7, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Aug 7, 2024

@bors r=nikic

@bors
Copy link
Contributor

bors commented Aug 7, 2024

📌 Commit 273c67d has been approved by nikic

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 7, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 7, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
@bors
Auto merge of rust-lang#128796 - matthiaskrgr:rollup-r7l68ph, r=matth…
8b38707 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128221 (Add implied target features to target_feature attribute)
 - rust-lang#128261 (impl `Default` for collection iterators that don't already have it)
 - rust-lang#128353 (Change generate-copyright to generate HTML, with cargo dependencies included)
 - rust-lang#128679 (codegen: better centralize function declaration attribute computation)
 - rust-lang#128732 (make `import.vis` is immutable)
 - rust-lang#128755 (Integrate crlf directly into related test file instead via of .gitattributes)
 - rust-lang#128772 (rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC)
 - rust-lang#128782 (unused_parens: do not lint against parens around &raw)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f39b86 into rust-lang:master Aug 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
@rust-timer
Unrolled build for rust-lang#128679
f63e94b 
Rollup merge of rust-lang#128679 - RalfJung:codegen-fn-attrs, r=nikic

codegen: better centralize function declaration attribute computation

For some reason, the codegen backend has two functions that compute which attributes a function declaration gets: `apply_attrs_llfn` and `attributes::from_fn_attrs`. They are called in different places, on entirely different layers of abstraction.

To me the code seems cleaner if we centralize this entirely in `apply_attrs_llfn`, so that's what this PR does.
@RalfJung RalfJung deleted the codegen-fn-attrs branch August 8, 2024 09:59
davidtwco added a commit to davidtwco/rust that referenced this pull request Sep 13, 2024
@davidtwco
tests: add test for rust-lang#105111
925af7a 
Enabling a tied feature should not enable the other feature
automatically. This was fixed by something in rust-lang#128796, probably rust-lang#128221
or rust-lang#128679.
@davidtwco davidtwco mentioned this pull request Sep 13, 2024
Merged
davidtwco added a commit to davidtwco/rust that referenced this pull request Sep 13, 2024
@davidtwco
tests: add test for rust-lang#105111
6d9b2d8 
Enabling a tied feature should not enable the other feature
automatically. This was fixed by something in rust-lang#128796, probably rust-lang#128221
or rust-lang#128679.
davidtwco added a commit to davidtwco/rust that referenced this pull request Sep 24, 2024
@davidtwco
tests: add test for rust-lang#105111
6edd86d 
Enabling a tied feature should not enable the other feature
automatically. This was fixed by something in rust-lang#128796, probably rust-lang#128221
or rust-lang#128679.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidatio…
b38afa0 
…n, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidatio…
5b2942e 
…n, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Oct 10, 2024
@workingjubilee
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidatio…
7dc0ce4 
…n, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidatio…
13976f1 
…n, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 10, 2024
@rust-timer
Unrolled build for rust-lang#130308
e920f42 
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidation, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
antoyo pushed a commit to antoyo/rust that referenced this pull request Jan 13, 2025
@matthiaskrgr
Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidatio…
2ca5753 
…n, r=wesleywiser

codegen_ssa: consolidate tied target checks

Fixes rust-lang#105110.
Fixes rust-lang#105111.

`rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected.

Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@nikic nikic

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @rustbot @nikic @bors @lcnr