Skip to content

Commit

Permalink
Auto merge of rust-lang#105605 - inquisitivecrystal:attr-validation, …
Browse files Browse the repository at this point in the history
…r=cjgillot

Don't perform invalid checks in `codegen_attrs`

The attributes `#[track_caller]` and `#[cmse_nonsecure_entry]` are only valid on functions. When validating one of these attributes, codegen_attrs previously called `fn_sig`, [which can only be used on functions](rust-lang#105201), on the item the attribute was attached to, assuming that the item was a function without checking. This led to [ICEs in situations where the attribute was incorrectly used on non-functions](rust-lang#105594).

With this change, we skip calling `fn_sig` if the item the attribute is attached to must be a function but isn't, because `check_attr` will reject such cases without codegen_attrs's intervention.

As a side note, some of the attributes in codegen_attrs are only valid on functions, but that property isn't actually checked. I'm planning to fix that in a follow up PR since it's a behavior change that will need to be validated rather than an obvious bugfix. Thankfully, all the attributes like that I've found so far are unstable.

Fixes rust-lang#105594.

r? `@cjgillot`
  • Loading branch information
bors committed Dec 26, 2022
2 parents 729dc5d + 12efdd4 commit 203f529
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 203f529

Please sign in to comment.