Port rustc_no_mir_inline to the new attribute parser

Author: jdonszelmann

compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

@@ -511,6 +511,21 @@ impl<S: Stage> NoArgsAttributeParser<S> for RustcTrivialFieldReadsParser {
     const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcTrivialFieldReads;
 }
 
+pub(crate) struct RustcNoMirInlineParser;
+
+impl<S: Stage> NoArgsAttributeParser<S> for RustcNoMirInlineParser {
+    const PATH: &[Symbol] = &[sym::rustc_no_mir_inline];
+    const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
+        Allow(Target::Fn),
+        Allow(Target::Method(MethodKind::Inherent)),
+        Allow(Target::Method(MethodKind::Trait { body: false })),
+        Allow(Target::Method(MethodKind::Trait { body: true })),
+        Allow(Target::Method(MethodKind::TraitImpl)),
+    ]);
+    const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcNoMirInline;
+}
+
 pub(crate) struct RustcLintQueryInstabilityParser;
 
 impl<S: Stage> NoArgsAttributeParser<S> for RustcLintQueryInstabilityParser {

compiler/rustc_attr_parsing/src/context.rs

@@ -169,32 +169,6 @@ attribute_parsers!(
         // tidy-alphabetical-end
 
         // tidy-alphabetical-start
-%%%%%%% Changes from base to side #1
-%%%%%%%%%%% Changes from base to side #1
-         Single<WithoutArgs<RustcStrictCoherenceParser>>,
-         Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
-         Single<WithoutArgs<RustcVarianceParser>>,
-         Single<WithoutArgs<SpecializationTraitParser>>,
-         Single<WithoutArgs<StdInternalSymbolParser>>,
-         Single<WithoutArgs<ThreadLocalParser>>,
-         Single<WithoutArgs<TrackCallerParser>>,
-+        Single<WithoutArgs<RustcStrictCoherenceParser>>,
-+++++++ Contents of side #2
-        Single<WithoutArgs<RustcTrivialFieldReadsParser>>,
-+++++++++++ Contents of side #2
--        Single<WithoutArgs<TypeConstParser>>,
-         Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
-<<<<<<< Conflict 1 of 1
-<<<<<<<<<<< Conflict 2 of 2
->>>>>>> Conflict 1 of 1 ends
-        Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
-        Single<WithoutArgs<RustcVarianceParser>>,
-        Single<WithoutArgs<SpecializationTraitParser>>,
-        Single<WithoutArgs<StdInternalSymbolParser>>,
-        Single<WithoutArgs<ThreadLocalParser>>,
-        Single<WithoutArgs<TrackCallerParser>>,
-        Single<WithoutArgs<TypeConstParser>>,
-        Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
         Single<CfiEncodingParser>,
         Single<CollapseDebugInfoParser>,
         Single<CoverageParser>,
@@ -237,9 +211,9 @@ attribute_parsers!(
         Single<RustcLintOptDenyFieldAccessParser>,
         Single<RustcMustImplementOneOfParser>,
         Single<RustcNeverTypeOptionsParser>,
+        Single<RustcNeverTypeOptionsParser>,
         Single<RustcObjectLifetimeDefaultParser>,
         Single<RustcReservationImplParser>,
-        Single<RustcNeverTypeOptionsParser>,
         Single<RustcScalableVectorParser>,
         Single<RustcSimdMonomorphizeLaneLimitParser>,
         Single<RustcSymbolName>,
@@ -315,6 +289,7 @@ attribute_parsers!(
         Single<WithoutArgs<RustcNeverReturnsNullPointerParser>>,
         Single<WithoutArgs<RustcNoImplicitAutorefsParser>>,
         Single<WithoutArgs<RustcNoImplicitBoundsParser>>,
+        Single<WithoutArgs<RustcNoMirInlineParser>>,
         Single<WithoutArgs<RustcNonConstTraitMethodParser>>,
         Single<WithoutArgs<RustcNounwindParser>>,
         Single<WithoutArgs<RustcOffloadKernelParser>>,
@@ -324,7 +299,23 @@ attribute_parsers!(
         Single<WithoutArgs<RustcReallocatorParser>>,
         Single<WithoutArgs<RustcRegionsParser>>,
         Single<WithoutArgs<RustcShouldNotBeCalledOnConstItems>>,
->>>>>>>>>>> Conflict 2 of 2 ends
+        Single<WithoutArgs<RustcStrictCoherenceParser>>,
+        Single<WithoutArgs<RustcStrictCoherenceParser>>,
+        Single<WithoutArgs<RustcTrivialFieldReadsParser>>,
+        Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
+        Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
+        Single<WithoutArgs<RustcVarianceParser>>,
+        Single<WithoutArgs<RustcVarianceParser>>,
+        Single<WithoutArgs<SpecializationTraitParser>>,
+        Single<WithoutArgs<SpecializationTraitParser>>,
+        Single<WithoutArgs<StdInternalSymbolParser>>,
+        Single<WithoutArgs<StdInternalSymbolParser>>,
+        Single<WithoutArgs<ThreadLocalParser>>,
+        Single<WithoutArgs<ThreadLocalParser>>,
+        Single<WithoutArgs<TrackCallerParser>>,
+        Single<WithoutArgs<TrackCallerParser>>,
+        Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
+        Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
         // tidy-alphabetical-end
     ];
 );

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -1249,6 +1249,9 @@ pub enum AttributeKind {
     /// Represents `#[rustc_no_implicit_bounds]`
     RustcNoImplicitBounds,
 
+    /// Represents `#[rustc_no_mir_inline]`
+    RustcNoMirInline,
+
     /// Represents `#[rustc_non_const_trait_method]`.
     RustcNonConstTraitMethod,
 

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

@@ -143,6 +143,7 @@ impl AttributeKind {
             RustcNeverTypeOptions { .. } => No,
             RustcNoImplicitAutorefs => Yes,
             RustcNoImplicitBounds => No,
+            RustcNoMirInline => Yes,
             RustcNonConstTraitMethod => No, // should be reported via other queries like `constness`
             RustcNounwind => No,
             RustcObjcClass { .. } => No,

compiler/rustc_mir_transform/src/check_inline.rs

@@ -8,7 +8,6 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir::{Body, TerminatorKind};
 use rustc_middle::ty;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::sym;
 
 use crate::pass_manager::MirLint;
 
@@ -42,7 +41,8 @@ pub(super) fn is_inline_valid_on_fn<'tcx>(
     def_id: DefId,
 ) -> Result<(), &'static str> {
     let codegen_attrs = tcx.codegen_fn_attrs(def_id);
-    if tcx.has_attr(def_id, sym::rustc_no_mir_inline) {
+
+    if find_attr!(tcx.get_all_attrs(def_id), AttributeKind::RustcNoMirInline) {
         return Err("#[rustc_no_mir_inline]");
     }
 

compiler/rustc_passes/src/check_attr.rs

@@ -336,6 +336,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                     | AttributeKind::RustcNeverTypeOptions {..}
                     | AttributeKind::RustcNoImplicitAutorefs
                     | AttributeKind::RustcNoImplicitBounds
+                    | AttributeKind::RustcNoMirInline
                     | AttributeKind::RustcNonConstTraitMethod
                     | AttributeKind::RustcNounwind
                     | AttributeKind::RustcObjcClass { .. }
@@ -397,7 +398,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                             | sym::lang
                             | sym::default_lib_allocator
                             | sym::rustc_diagnostic_item
-                            | sym::rustc_no_mir_inline
                             | sym::rustc_nonnull_optimization_guaranteed
                             | sym::rustc_inherit_overflow_checks
                             | sym::rustc_on_unimplemented