Skip to content

Commit 378ca9c

Browse files
carbotaniumancarbotaniuman
committed
Parse unsafe attributes
1 parent 6a9758d commit 378ca9c

File tree

19 files changed

+169
-26
lines changed

19 files changed

+169
-26
lines changed

‎compiler/rustc_ast/src/ast.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ pub struct Crate {
489489
/// E.g., `#[test]`, `#[derive(..)]`, `#[rustfmt::skip]` or `#[feature = "foo"]`.
490490
#[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
491491
pub struct MetaItem {
492+
pub unsafety: Unsafe,
492493
pub path: Path,
493494
pub kind: MetaItemKind,
494495
pub span: Span,
@@ -2793,14 +2794,20 @@ pub struct NormalAttr {
27932794
impl NormalAttr {
27942795
pub fn from_ident(ident: Ident) -> Self {
27952796
Self {
2796-
item: AttrItem { path: Path::from_ident(ident), args: AttrArgs::Empty, tokens: None },
2797+
item: AttrItem {
2798+
unsafety: Unsafe::No,
2799+
path: Path::from_ident(ident),
2800+
args: AttrArgs::Empty,
2801+
tokens: None,
2802+
},
27972803
tokens: None,
27982804
}
27992805
}
28002806
}
28012807

28022808
#[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
28032809
pub struct AttrItem {
2810+
pub unsafety: Unsafe,
28042811
pub path: Path,
28052812
pub args: AttrArgs,
28062813
// Tokens for the meta item, e.g. just the `foo` within `#[foo]` or `#![foo]`.

‎compiler/rustc_ast/src/attr/mod.rs

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! Functions dealing with attributes and meta items.
22
3-
use crate::ast::{AttrArgs, AttrArgsEq, AttrId, AttrItem, AttrKind, AttrStyle, AttrVec, Attribute};
3+
use crate::ast::{
4+
AttrArgs, AttrArgsEq, AttrId, AttrItem, AttrKind, AttrStyle, AttrVec, Attribute, Unsafe,
5+
};
46
use crate::ast::{DelimArgs, Expr, ExprKind, LitKind, MetaItemLit};
57
use crate::ast::{MetaItem, MetaItemKind, NestedMetaItem, NormalAttr};
68
use crate::ast::{Path, PathSegment, DUMMY_NODE_ID};
@@ -227,7 +229,12 @@ impl AttrItem {
227229
}
228230

229231
pub fn meta(&self, span: Span) -> Option<MetaItem> {
230-
Some(MetaItem { path: self.path.clone(), kind: self.meta_kind()?, span })
232+
Some(MetaItem {
233+
unsafety: Unsafe::No,
234+
path: self.path.clone(),
235+
kind: self.meta_kind()?,
236+
span,
237+
})
231238
}
232239

233240
pub fn meta_kind(&self) -> Option<MetaItemKind> {
@@ -360,7 +367,8 @@ impl MetaItem {
360367
_ => path.span.hi(),
361368
};
362369
let span = path.span.with_hi(hi);
363-
Some(MetaItem { path, kind, span })
370+
// FIX THIS LATER
371+
Some(MetaItem { unsafety: Unsafe::No, path, kind, span })
364372
}
365373
}
366374

@@ -544,11 +552,12 @@ pub fn mk_doc_comment(
544552
pub fn mk_attr(
545553
g: &AttrIdGenerator,
546554
style: AttrStyle,
555+
unsafety: Unsafe,
547556
path: Path,
548557
args: AttrArgs,
549558
span: Span,
550559
) -> Attribute {
551-
mk_attr_from_item(g, AttrItem { path, args, tokens: None }, None, style, span)
560+
mk_attr_from_item(g, AttrItem { unsafety, path, args, tokens: None }, None, style, span)
552561
}
553562

554563
pub fn mk_attr_from_item(
@@ -566,15 +575,22 @@ pub fn mk_attr_from_item(
566575
}
567576
}
568577

569-
pub fn mk_attr_word(g: &AttrIdGenerator, style: AttrStyle, name: Symbol, span: Span) -> Attribute {
578+
pub fn mk_attr_word(
579+
g: &AttrIdGenerator,
580+
style: AttrStyle,
581+
unsafety: Unsafe,
582+
name: Symbol,
583+
span: Span,
584+
) -> Attribute {
570585
let path = Path::from_ident(Ident::new(name, span));
571586
let args = AttrArgs::Empty;
572-
mk_attr(g, style, path, args, span)
587+
mk_attr(g, style, unsafety, path, args, span)
573588
}
574589

575590
pub fn mk_attr_nested_word(
576591
g: &AttrIdGenerator,
577592
style: AttrStyle,
593+
unsafety: Unsafe,
578594
outer: Symbol,
579595
inner: Symbol,
580596
span: Span,
@@ -590,12 +606,13 @@ pub fn mk_attr_nested_word(
590606
delim: Delimiter::Parenthesis,
591607
tokens: inner_tokens,
592608
});
593-
mk_attr(g, style, path, attr_args, span)
609+
mk_attr(g, style, unsafety, path, attr_args, span)
594610
}
595611

596612
pub fn mk_attr_name_value_str(
597613
g: &AttrIdGenerator,
598614
style: AttrStyle,
615+
unsafety: Unsafe,
599616
name: Symbol,
600617
val: Symbol,
601618
span: Span,
@@ -610,7 +627,7 @@ pub fn mk_attr_name_value_str(
610627
});
611628
let path = Path::from_ident(Ident::new(name, span));
612629
let args = AttrArgs::Eq(span, AttrArgsEq::Ast(expr));
613-
mk_attr(g, style, path, args, span)
630+
mk_attr(g, style, unsafety, path, args, span)
614631
}
615632

616633
pub fn filter_by_name(attrs: &[Attribute], name: Symbol) -> impl Iterator<Item = &Attribute> {

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,10 @@ fn noop_visit_attribute<T: MutVisitor>(attr: &mut Attribute, vis: &mut T) {
647647
let Attribute { kind, id: _, style: _, span } = attr;
648648
match kind {
649649
AttrKind::Normal(normal) => {
650-
let NormalAttr { item: AttrItem { path, args, tokens }, tokens: attr_tokens } =
651-
&mut **normal;
650+
let NormalAttr {
651+
item: AttrItem { unsafety: _, path, args, tokens },
652+
tokens: attr_tokens,
653+
} = &mut **normal;
652654
vis.visit_path(path);
653655
visit_attr_args(args, vis);
654656
visit_lazy_tts(tokens, vis);
@@ -678,7 +680,7 @@ fn noop_visit_meta_list_item<T: MutVisitor>(li: &mut NestedMetaItem, vis: &mut T
678680
}
679681

680682
fn noop_visit_meta_item<T: MutVisitor>(mi: &mut MetaItem, vis: &mut T) {
681-
let MetaItem { path: _, kind, span } = mi;
683+
let MetaItem { unsafety: _, path: _, kind, span } = mi;
682684
match kind {
683685
MetaItemKind::Word => {}
684686
MetaItemKind::List(mis) => visit_thin_vec(mis, |mi| vis.visit_meta_list_item(mi)),
@@ -838,7 +840,7 @@ fn visit_nonterminal<T: MutVisitor>(nt: &mut token::Nonterminal, vis: &mut T) {
838840
token::NtLifetime(ident) => vis.visit_ident(ident),
839841
token::NtLiteral(expr) => vis.visit_expr(expr),
840842
token::NtMeta(item) => {
841-
let AttrItem { path, args, tokens } = item.deref_mut();
843+
let AttrItem { unsafety: _, path, args, tokens } = item.deref_mut();
842844
vis.visit_path(path);
843845
visit_attr_args(args, vis);
844846
visit_lazy_tts(tokens, vis);

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,6 +1805,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
18051805
let attr = attr::mk_attr_nested_word(
18061806
&self.tcx.sess.psess.attr_id_generator,
18071807
AttrStyle::Outer,
1808+
Unsafe::No,
18081809
sym::allow,
18091810
sym::unreachable_code,
18101811
self.lower_span(span),

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
908908
let kind = match attr.kind {
909909
AttrKind::Normal(ref normal) => AttrKind::Normal(P(NormalAttr {
910910
item: AttrItem {
911+
unsafety: normal.item.unsafety,
911912
path: normal.item.path.clone(),
912913
args: self.lower_attr_args(&normal.item.args),
913914
tokens: None,

‎compiler/rustc_ast_passes/src/feature_gate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
569569
gate_all!(postfix_match, "postfix match is experimental");
570570
gate_all!(mut_ref, "mutable by-reference bindings are experimental");
571571
gate_all!(precise_capturing, "precise captures on `impl Trait` are experimental");
572+
gate_all!(unsafe_attributes, "`#[unsafe()]` markers for attributes are experimental");
572573

573574
if !visitor.features.never_patterns {
574575
if let Some(spans) = spans.get(&sym::never_patterns) {

‎compiler/rustc_ast_pretty/src/pprust/state.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_ast::token::{self, BinOpToken, CommentKind, Delimiter, Nonterminal, To
1616
use rustc_ast::tokenstream::{Spacing, TokenStream, TokenTree};
1717
use rustc_ast::util::classify;
1818
use rustc_ast::util::comments::{Comment, CommentStyle};
19-
use rustc_ast::{self as ast, AttrArgs, AttrArgsEq, BlockCheckMode, PatKind};
19+
use rustc_ast::{self as ast, AttrArgs, AttrArgsEq, BlockCheckMode, PatKind, Unsafe};
2020
use rustc_ast::{attr, BindingMode, ByRef, DelimArgs, RangeEnd, RangeSyntax, Term};
2121
use rustc_ast::{GenericArg, GenericBound, SelfKind};
2222
use rustc_ast::{InlineAsmOperand, InlineAsmRegOrRegClass};
@@ -245,6 +245,7 @@ pub fn print_crate<'a>(
245245
let fake_attr = attr::mk_attr_nested_word(
246246
g,
247247
ast::AttrStyle::Inner,
248+
Unsafe::No,
248249
sym::feature,
249250
sym::prelude_import,
250251
DUMMY_SP,
@@ -255,7 +256,8 @@ pub fn print_crate<'a>(
255256
// root, so this is not needed, and actually breaks things.
256257
if edition.is_rust_2015() {
257258
// `#![no_std]`
258-
let fake_attr = attr::mk_attr_word(g, ast::AttrStyle::Inner, sym::no_std, DUMMY_SP);
259+
let fake_attr =
260+
attr::mk_attr_word(g, ast::AttrStyle::Inner, Unsafe::No, sym::no_std, DUMMY_SP);
259261
s.print_attribute(&fake_attr);
260262
}
261263
}

‎compiler/rustc_builtin_macros/src/cmdline_attrs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn inject(krate: &mut ast::Crate, psess: &ParseSess, attrs: &[String]) {
1616
);
1717

1818
let start_span = parser.token.span;
19-
let AttrItem { path, args, tokens: _ } = match parser.parse_attr_item(false) {
19+
let AttrItem { unsafety, path, args, tokens: _ } = match parser.parse_attr_item(false) {
2020
Ok(ai) => ai,
2121
Err(err) => {
2222
err.emit();
@@ -32,6 +32,7 @@ pub fn inject(krate: &mut ast::Crate, psess: &ParseSess, attrs: &[String]) {
3232
krate.attrs.push(mk_attr(
3333
&psess.attr_id_generator,
3434
AttrStyle::Inner,
35+
unsafety,
3536
path,
3637
args,
3738
start_span.to(end_span),

‎compiler/rustc_builtin_macros/src/test_harness.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ impl<'a> MutVisitor for EntryPointCleaner<'a> {
202202
let allow_dead_code = attr::mk_attr_nested_word(
203203
&self.sess.psess.attr_id_generator,
204204
ast::AttrStyle::Outer,
205+
ast::Unsafe::No,
205206
sym::allow,
206207
sym::dead_code,
207208
self.def_site,

‎compiler/rustc_expand/src/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,20 +690,20 @@ impl<'a> ExtCtxt<'a> {
690690
// Builds `#[name]`.
691691
pub fn attr_word(&self, name: Symbol, span: Span) -> ast::Attribute {
692692
let g = &self.sess.psess.attr_id_generator;
693-
attr::mk_attr_word(g, ast::AttrStyle::Outer, name, span)
693+
attr::mk_attr_word(g, ast::AttrStyle::Outer, ast::Unsafe::No, name, span)
694694
}
695695

696696
// Builds `#[name = val]`.
697697
//
698698
// Note: `span` is used for both the identifier and the value.
699699
pub fn attr_name_value_str(&self, name: Symbol, val: Symbol, span: Span) -> ast::Attribute {
700700
let g = &self.sess.psess.attr_id_generator;
701-
attr::mk_attr_name_value_str(g, ast::AttrStyle::Outer, name, val, span)
701+
attr::mk_attr_name_value_str(g, ast::AttrStyle::Outer, ast::Unsafe::No, name, val, span)
702702
}
703703

704704
// Builds `#[outer(inner)]`.
705705
pub fn attr_nested_word(&self, outer: Symbol, inner: Symbol, span: Span) -> ast::Attribute {
706706
let g = &self.sess.psess.attr_id_generator;
707-
attr::mk_attr_nested_word(g, ast::AttrStyle::Outer, outer, inner, span)
707+
attr::mk_attr_nested_word(g, ast::AttrStyle::Outer, ast::Unsafe::No, outer, inner, span)
708708
}
709709
}

0 commit comments

Comments
 (0)