Port #[link_ordinal] to the new attribute parsing infrastructure.

Author: Periodic1911

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -7,8 +7,9 @@ use rustc_span::{Symbol, sym};
 use crate::attributes::{AttributeOrder, OnDuplicate, SingleAttributeParser};
 use crate::context::{AcceptContext, Stage};
 use crate::parser::ArgParser;
-use crate::session_diagnostics::{InvalidLinkOrdinalFormat, LinkOrdinalOutOfRange};
-use crate::session_diagnostics::NullOnLinkSection;
+use crate::session_diagnostics::{
+    InvalidLinkOrdinalFormat, LinkOrdinalOutOfRange, NullOnLinkSection,
+};
 
 pub(crate) struct LinkNameParser;
 

compiler/rustc_attr_parsing/src/context.rs

@@ -22,8 +22,8 @@ use crate::attributes::codegen_attrs::{
 use crate::attributes::confusables::ConfusablesParser;
 use crate::attributes::deprecation::DeprecationParser;
 use crate::attributes::inline::{InlineParser, RustcForceInlineParser};
-use crate::attributes::link_attrs::{LinkNameParser, LinkSectionParser, LinkOrdinalParser};
-use crate::attributes::lint_helpers::{AsPtrParser, PubTransparentParser, PassByValueParser};
+use crate::attributes::link_attrs::{LinkNameParser, LinkOrdinalParser, LinkSectionParser};
+use crate::attributes::lint_helpers::{AsPtrParser, PassByValueParser, PubTransparentParser};
 use crate::attributes::loop_match::{ConstContinueParser, LoopMatchParser};
 use crate::attributes::must_use::MustUseParser;
 use crate::attributes::no_implicit_prelude::NoImplicitPreludeParser;

compiler/rustc_parse/src/validate_attr.rs

@@ -267,6 +267,57 @@ pub fn check_builtin_meta_item(
     deny_unsafety: bool,
 ) {
     if !is_attr_template_compatible(&template, &meta.kind) {
+        emit_malformed_attribute(psess, style, meta.span, name, template);
+    }
+
+    if deny_unsafety {
+        deny_builtin_meta_unsafety(psess, meta);
+    }
+}
+
+fn emit_malformed_attribute(
+    psess: &ParseSess,
+    style: ast::AttrStyle,
+    span: Span,
+    name: Symbol,
+    template: AttributeTemplate,
+) {
+    // attrs with new parsers are locally validated so excluded here
+    if matches!(
+        name,
+        sym::inline
+            | sym::may_dangle
+            | sym::rustc_as_ptr
+            | sym::rustc_pub_transparent
+            | sym::rustc_const_stable_indirect
+            | sym::rustc_force_inline
+            | sym::rustc_confusables
+            | sym::rustc_skip_during_method_dispatch
+            | sym::rustc_pass_by_value
+            | sym::repr
+            | sym::align
+            | sym::deprecated
+            | sym::optimize
+            | sym::cold
+            | sym::target_feature
+            | sym::rustc_allow_const_fn_unstable
+            | sym::naked
+            | sym::no_mangle
+            | sym::non_exhaustive
+            | sym::path
+            | sym::ignore
+            | sym::must_use
+            | sym::track_caller
+            | sym::link_ordinal
+            | sym::link_name
+            | sym::export_name
+            | sym::rustc_macro_transparency
+            | sym::link_section
+            | sym::rustc_layout_scalar_valid_range_start
+            | sym::rustc_layout_scalar_valid_range_end
+            | sym::no_implicit_prelude
+    ) {
+        return;
         // attrs with new parsers are locally validated so excluded here
         if matches!(
             name,

tests/ui/attributes/malformed-attrs.stderr

@@ -146,12 +146,6 @@ error: malformed `ffi_pure` attribute input
 LL |     #[unsafe(ffi_pure = 1)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[ffi_pure]`
 
-error: malformed `link_ordinal` attribute input
-  --> $DIR/malformed-attrs.rs:167:5
-   |
-LL |     #[link_ordinal]
-   |     ^^^^^^^^^^^^^^^ help: must be of the form: `#[link_ordinal(ordinal)]`
-
 error: malformed `ffi_const` attribute input
   --> $DIR/malformed-attrs.rs:171:5
    |
@@ -537,6 +531,15 @@ LL | #[rustc_layout_scalar_valid_range_end]
    | expected this to be a list
    | help: must be of the form: `#[rustc_layout_scalar_valid_range_end(end)]`
 
+error[E0539]: malformed `link_ordinal` attribute input
+  --> $DIR/malformed-attrs.rs:167:5
+   |
+LL |     #[link_ordinal]
+   |     ^^^^^^^^^^^^^^^
+   |     |
+   |     expected this to be a list
+   |     help: must be of the form: `#[link_ordinal(ordinal)]`
+
 error[E0565]: malformed `non_exhaustive` attribute input
   --> $DIR/malformed-attrs.rs:197:1
    |