Skip to content

Commit 48b6d12

Browse files
jdonszelmannjdonszelmann
committed
move naked checks out of check_attr.rs
1 parent a427efb commit 48b6d12

File tree

14 files changed

+202
-181
lines changed

14 files changed

+202
-181
lines changed

‎compiler/rustc_attr_parsing/messages.ftl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ attr_parsing_missing_since =
8686
attr_parsing_multiple_stability_levels =
8787
multiple stability levels
8888
89+
attr_parsing_naked_functions_incompatible_attribute =
90+
attribute incompatible with `#[unsafe(naked)]`
91+
.label = the `{$attr}` attribute is incompatible with `#[unsafe(naked)]`
92+
.naked_attribute = function marked with `#[unsafe(naked)]` here
8993
attr_parsing_non_ident_feature =
9094
'feature' is not an identifier
9195

‎compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs‎

Lines changed: 100 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
use rustc_attr_data_structures::{AttributeKind, OptimizeAttr};
22
use rustc_feature::{AttributeTemplate, template};
3-
use rustc_span::sym;
3+
use rustc_session::parse::feature_err;
4+
use rustc_span::{Span, sym};
45

5-
use super::{AttributeOrder, OnDuplicate, SingleAttributeParser};
6-
use crate::context::{AcceptContext, Stage};
6+
use super::{AcceptMapping, AttributeOrder, AttributeParser, OnDuplicate, SingleAttributeParser};
7+
use crate::context::{AcceptContext, FinalizeContext, Stage};
78
use crate::parser::ArgParser;
9+
use crate::session_diagnostics::NakedFunctionIncompatibleAttribute;
810

911
pub(crate) struct OptimizeParser;
1012

@@ -57,19 +59,104 @@ impl<S: Stage> SingleAttributeParser<S> for ColdParser {
5759
}
5860
}
5961

60-
pub(crate) struct NakedParser;
62+
#[derive(Default)]
63+
pub(crate) struct NakedParser {
64+
span: Option<Span>,
65+
}
6166

62-
impl<S: Stage> SingleAttributeParser<S> for NakedParser {
63-
const PATH: &[rustc_span::Symbol] = &[sym::naked];
64-
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepLast;
65-
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
66-
const TEMPLATE: AttributeTemplate = template!(Word);
67+
impl<S: Stage> AttributeParser<S> for NakedParser {
68+
const ATTRIBUTES: AcceptMapping<Self, S> =
69+
&[(&[sym::naked], template!(Word), |this, cx, args| {
70+
if !args.no_args() {
71+
cx.expected_no_args(args.span().unwrap_or(cx.attr_span));
72+
return;
73+
}
6774

68-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
69-
if !args.no_args() {
70-
cx.expected_no_args(args.span().unwrap_or(cx.attr_span));
75+
if let Some(earlier) = this.span {
76+
let span = cx.attr_span;
77+
cx.warn_unused_duplicate(earlier, span);
78+
} else {
79+
this.span = Some(cx.attr_span);
80+
}
81+
})];
82+
83+
fn finalize(self, cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
84+
// FIXME(jdonszelmann): upgrade this list to *parsed* attributes
85+
// once all of these have parsed forms. That'd make the check much nicer...
86+
//
87+
// many attributes don't make sense in combination with #[naked].
88+
// Notable attributes that are incompatible with `#[naked]` are:
89+
//
90+
// * `#[inline]`
91+
// * `#[track_caller]`
92+
// * `#[test]`, `#[ignore]`, `#[should_panic]`
93+
//
94+
// NOTE: when making changes to this list, check that `error_codes/E0736.md` remains
95+
// accurate.
96+
const ALLOW_LIST: &[rustc_span::Symbol] = &[
97+
// conditional compilation
98+
sym::cfg_trace,
99+
sym::cfg_attr_trace,
100+
// testing (allowed here so better errors can be generated in `rustc_builtin_macros::test`)
101+
sym::test,
102+
sym::ignore,
103+
sym::should_panic,
104+
sym::bench,
105+
// diagnostics
106+
sym::allow,
107+
sym::warn,
108+
sym::deny,
109+
sym::forbid,
110+
sym::deprecated,
111+
sym::must_use,
112+
// abi, linking and FFI
113+
sym::cold,
114+
sym::export_name,
115+
sym::link_section,
116+
sym::linkage,
117+
sym::no_mangle,
118+
sym::instruction_set,
119+
sym::repr,
120+
sym::rustc_std_internal_symbol,
121+
// obviously compatible with self
122+
sym::naked,
123+
// documentation
124+
sym::doc,
125+
];
126+
127+
let Some(span) = self.span else {
71128
return None;
129+
};
130+
131+
// only if we found a naked attribute do we do the somewhat expensive check
132+
'outer: for other_attr in cx.all_attrs {
133+
for allowed_attr in ALLOW_LIST {
134+
if other_attr.word_is(*allowed_attr) || other_attr.starts_with(&[sym::rustfmt]) {
135+
// effectively skips the error message being emitted below
136+
continue 'outer;
137+
}
138+
139+
if other_attr.word_is(sym::target_feature) {
140+
if !cx.features().naked_functions_target_feature() {
141+
feature_err(
142+
&cx.sess(),
143+
sym::naked_functions_target_feature,
144+
other_attr.span(),
145+
"`#[target_feature(/* ... */)]` is currently unstable on `#[naked]` functions",
146+
).emit();
147+
}
148+
149+
continue 'outer;
150+
}
151+
}
152+
153+
cx.emit_err(NakedFunctionIncompatibleAttribute {
154+
span: other_attr.span(),
155+
naked_span: span,
156+
attr: other_attr.get_attribute_path().to_string(),
157+
});
72158
}
73-
Some(AttributeKind::Naked(cx.attr_span))
159+
160+
Some(AttributeKind::Naked(span))
74161
}
75162
}

‎compiler/rustc_attr_parsing/src/attributes/inline.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ impl<S: Stage> SingleAttributeParser<S> for InlineParser {
4545
ArgParser::NameValue(_) => {
4646
let suggestions =
4747
<Self as SingleAttributeParser<S>>::TEMPLATE.suggestions(false, "inline");
48-
cx.emit_lint(
49-
AttributeLintKind::IllFormedAttributeInput { suggestions },
50-
cx.attr_span,
51-
);
48+
let span = cx.attr_span;
49+
cx.emit_lint(AttributeLintKind::IllFormedAttributeInput { suggestions }, span);
5250
return None;
5351
}
5452
}

‎compiler/rustc_attr_parsing/src/attributes/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use std::marker::PhantomData;
1818

1919
use rustc_attr_data_structures::AttributeKind;
20-
use rustc_attr_data_structures::lints::AttributeLintKind;
2120
use rustc_feature::AttributeTemplate;
2221
use rustc_span::{Span, Symbol};
2322
use thin_vec::ThinVec;

‎compiler/rustc_attr_parsing/src/context.rs‎

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use crate::attributes::stability::{
2626
};
2727
use crate::attributes::transparency::TransparencyParser;
2828
use crate::attributes::{AttributeParser as _, Combine, Single};
29-
use crate::parser::{ArgParser, MetaItemParser};
29+
use crate::parser::{ArgParser, MetaItemParser, PathParser};
3030
use crate::session_diagnostics::{AttributeParseError, AttributeParseErrorReason, UnknownMetaItem};
3131

3232
macro_rules! group_type {
@@ -94,6 +94,7 @@ attribute_parsers!(
9494
BodyStabilityParser,
9595
ConfusablesParser,
9696
ConstStabilityParser,
97+
NakedParser,
9798
StabilityParser,
9899
// tidy-alphabetical-end
99100

@@ -109,7 +110,6 @@ attribute_parsers!(
109110
Single<ConstStabilityIndirectParser>,
110111
Single<DeprecationParser>,
111112
Single<InlineParser>,
112-
Single<NakedParser>,
113113
Single<OptimizeParser>,
114114
Single<RustcForceInlineParser>,
115115
Single<TransparencyParser>,
@@ -168,7 +168,7 @@ pub struct Late;
168168
///
169169
/// Gives [`AttributeParser`]s enough information to create errors, for example.
170170
pub(crate) struct AcceptContext<'f, 'sess, S: Stage> {
171-
pub(crate) finalize_cx: FinalizeContext<'f, 'sess, S>,
171+
pub(crate) shared: SharedContext<'f, 'sess, S>,
172172
/// The span of the attribute currently being parsed
173173
pub(crate) attr_span: Span,
174174

@@ -181,7 +181,7 @@ pub(crate) struct AcceptContext<'f, 'sess, S: Stage> {
181181
pub(crate) attr_path: AttrPath,
182182
}
183183

184-
impl<'f, 'sess: 'f, S: Stage> AcceptContext<'f, 'sess, S> {
184+
impl<'f, 'sess: 'f, S: Stage> SharedContext<'f, 'sess, S> {
185185
pub(crate) fn emit_err(&self, diag: impl for<'x> Diagnostic<'x>) -> ErrorGuaranteed {
186186
S::emit_err(&self.sess, diag)
187187
}
@@ -219,7 +219,9 @@ impl<'f, 'sess: 'f, S: Stage> AcceptContext<'f, 'sess, S> {
219219
unused_span,
220220
)
221221
}
222+
}
222223

224+
impl<'f, 'sess: 'f, S: Stage> AcceptContext<'f, 'sess, S> {
223225
pub(crate) fn unknown_key(
224226
&self,
225227
span: Span,
@@ -352,24 +354,24 @@ impl<'f, 'sess: 'f, S: Stage> AcceptContext<'f, 'sess, S> {
352354
}
353355

354356
impl<'f, 'sess, S: Stage> Deref for AcceptContext<'f, 'sess, S> {
355-
type Target = FinalizeContext<'f, 'sess, S>;
357+
type Target = SharedContext<'f, 'sess, S>;
356358

357359
fn deref(&self) -> &Self::Target {
358-
&self.finalize_cx
360+
&self.shared
359361
}
360362
}
361363

362364
impl<'f, 'sess, S: Stage> DerefMut for AcceptContext<'f, 'sess, S> {
363365
fn deref_mut(&mut self) -> &mut Self::Target {
364-
&mut self.finalize_cx
366+
&mut self.shared
365367
}
366368
}
367369

368370
/// Context given to every attribute parser during finalization.
369371
///
370372
/// Gives [`AttributeParser`](crate::attributes::AttributeParser)s enough information to create
371373
/// errors, for example.
372-
pub(crate) struct FinalizeContext<'p, 'sess, S: Stage> {
374+
pub(crate) struct SharedContext<'p, 'sess, S: Stage> {
373375
/// The parse context, gives access to the session and the
374376
/// diagnostics context.
375377
pub(crate) cx: &'p mut AttributeParser<'sess, S>,
@@ -378,18 +380,48 @@ pub(crate) struct FinalizeContext<'p, 'sess, S: Stage> {
378380
/// The id ([`NodeId`] if `S` is `Early`, [`HirId`] if `S` is `Late`) of the syntactical component this attribute was applied to
379381
pub(crate) target_id: S::Id,
380382

381-
pub(crate) emit_lint: &'p mut dyn FnMut(AttributeLint<S::Id>),
383+
emit_lint: &'p mut dyn FnMut(AttributeLint<S::Id>),
384+
}
385+
386+
/// Context given to every attribute parser during finalization.
387+
///
388+
/// Gives [`AttributeParser`](crate::attributes::AttributeParser)s enough information to create
389+
/// errors, for example.
390+
pub(crate) struct FinalizeContext<'p, 'sess, S: Stage> {
391+
pub(crate) shared: SharedContext<'p, 'sess, S>,
392+
393+
/// A list of all attribute on this syntax node.
394+
///
395+
/// Useful for allowlists in finalize.
396+
///
397+
/// Usually, you should use normal attribute parsing logic instead,
398+
/// especially when making a *denylist* of other attributes.
399+
pub(crate) all_attrs: &'p [PathParser<'p>],
382400
}
383401

384402
impl<'p, 'sess: 'p, S: Stage> Deref for FinalizeContext<'p, 'sess, S> {
403+
type Target = SharedContext<'p, 'sess, S>;
404+
405+
fn deref(&self) -> &Self::Target {
406+
&self.shared
407+
}
408+
}
409+
410+
impl<'p, 'sess: 'p, S: Stage> DerefMut for FinalizeContext<'p, 'sess, S> {
411+
fn deref_mut(&mut self) -> &mut Self::Target {
412+
&mut self.shared
413+
}
414+
}
415+
416+
impl<'p, 'sess: 'p, S: Stage> Deref for SharedContext<'p, 'sess, S> {
385417
type Target = AttributeParser<'sess, S>;
386418

387419
fn deref(&self) -> &Self::Target {
388420
self.cx
389421
}
390422
}
391423

392-
impl<'p, 'sess: 'p, S: Stage> DerefMut for FinalizeContext<'p, 'sess, S> {
424+
impl<'p, 'sess: 'p, S: Stage> DerefMut for SharedContext<'p, 'sess, S> {
393425
fn deref_mut(&mut self) -> &mut Self::Target {
394426
self.cx
395427
}
@@ -499,6 +531,7 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
499531
mut emit_lint: impl FnMut(AttributeLint<S::Id>),
500532
) -> Vec<Attribute> {
501533
let mut attributes = Vec::new();
534+
let mut attr_paths = Vec::new();
502535

503536
for attr in attrs {
504537
// If we're only looking for a single attribute, skip all the ones we don't care about.
@@ -542,6 +575,8 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
542575
// }))
543576
// }
544577
ast::AttrKind::Normal(n) => {
578+
attr_paths.push(PathParser::Ast(&n.item.path));
579+
545580
let parser = MetaItemParser::from_attr(n, self.dcx());
546581
let path = parser.path();
547582
let args = parser.args();
@@ -550,7 +585,7 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
550585
if let Some(accepts) = S::parsers().0.get(parts.as_slice()) {
551586
for (template, accept) in accepts {
552587
let mut cx: AcceptContext<'_, 'sess, S> = AcceptContext {
553-
finalize_cx: FinalizeContext {
588+
shared: SharedContext {
554589
cx: self,
555590
target_span,
556591
target_id,
@@ -594,10 +629,13 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
594629
let mut parsed_attributes = Vec::new();
595630
for f in &S::parsers().1 {
596631
if let Some(attr) = f(&mut FinalizeContext {
597-
cx: self,
598-
target_span,
599-
target_id,
600-
emit_lint: &mut emit_lint,
632+
shared: SharedContext {
633+
cx: self,
634+
target_span,
635+
target_id,
636+
emit_lint: &mut emit_lint,
637+
},
638+
all_attrs: &attr_paths,
601639
}) {
602640
parsed_attributes.push(Attribute::Parsed(attr));
603641
}

‎compiler/rustc_attr_parsing/src/parser.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ impl<'a> PathParser<'a> {
8787
pub fn word_is(&self, sym: Symbol) -> bool {
8888
self.word().map(|i| i.name == sym).unwrap_or(false)
8989
}
90+
91+
/// Checks whether the first segments match the givens.
92+
///
93+
/// Unlike [`segments_is`](Self::segments_is),
94+
/// `self` may contain more segments than the number matched against.
95+
pub fn starts_with(&self, segments: &[Symbol]) -> bool {
96+
self.segments().zip(segments).all(|(a, b)| a.name == *b)
97+
}
9098
}
9199

92100
impl Display for PathParser<'_> {

‎compiler/rustc_attr_parsing/src/session_diagnostics.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,17 @@ pub(crate) struct UnrecognizedReprHint {
465465
pub span: Span,
466466
}
467467

468+
#[derive(Diagnostic)]
469+
#[diag(attr_parsing_naked_functions_incompatible_attribute, code = E0736)]
470+
pub(crate) struct NakedFunctionIncompatibleAttribute {
471+
#[primary_span]
472+
#[label]
473+
pub span: Span,
474+
#[label(attr_parsing_naked_attribute)]
475+
pub naked_span: Span,
476+
pub attr: String,
477+
}
478+
468479
pub(crate) enum AttributeParseErrorReason {
469480
ExpectedNoArgs,
470481
ExpectedStringLiteral { byte_string: Option<Span> },

‎compiler/rustc_passes/messages.ftl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,6 @@ passes_must_not_suspend =
491491
passes_must_use_no_effect =
492492
`#[must_use]` has no effect when applied to {$article} {$target}
493493
494-
passes_naked_functions_incompatible_attribute =
495-
attribute incompatible with `#[unsafe(naked)]`
496-
.label = the `{$attr}` attribute is incompatible with `#[unsafe(naked)]`
497-
.naked_attribute = function marked with `#[unsafe(naked)]` here
498-
499494
passes_no_link =
500495
attribute should be applied to an `extern crate` item
501496
.label = not an `extern crate` item

0 commit comments

Comments
 (0)