Rollup merge of rust-lang#157474 - veluca93:optimize-error-optimize-inline, r=JonathanBrouwer

Forbid optimize(none) with inline(always) or inline.

Tracking issue: rust-lang#54882
Stabilization PR: rust-lang#157273

Author: jhpratt

compiler/rustc_passes/src/check_attr.rs

@@ -18,7 +18,7 @@ use rustc_feature::BUILTIN_ATTRIBUTE_MAP;
 use rustc_hir::attrs::diagnostic::Directive;
 use rustc_hir::attrs::{
     AttributeKind, DocAttribute, DocInline, EiiDecl, EiiImpl, EiiImplResolution, InlineAttr,
-    ReprAttr,
+    OptimizeAttr, ReprAttr,
 };
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::LocalModDefId;
@@ -163,6 +163,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         self.check_repr(attrs, span, target, item, hir_id);
         self.check_rustc_force_inline(hir_id, attrs, target);
         self.check_mix_no_mangle_export(hir_id, attrs);
+        self.check_optimize_and_inline(attrs);
     }
 
     /// Called by [`Self::check_attributes()`] to check a single attribute which is
@@ -1582,6 +1583,17 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         }
     }
 
+    fn check_optimize_and_inline(&self, attrs: &[Attribute]) {
+        if let Some(optimize_span) =
+            find_attr!(attrs, Optimize(OptimizeAttr::DoNotOptimize, span) => *span)
+            && let Some((inline_attr, inline_span)) =
+                find_attr!(attrs, Inline(inline_attr, span) => (inline_attr, *span))
+            && inline_attr != &InlineAttr::Never
+        {
+            self.dcx().emit_err(errors::BothOptimizeNoneAndInline { optimize_span, inline_span });
+        }
+    }
+
     fn check_loop_match(&self, hir_id: HirId, attr_span: Span, target: Target) {
         let node_span = self.tcx.hir_span(hir_id);
 

compiler/rustc_passes/src/errors.rs

@@ -178,6 +178,16 @@ pub(crate) struct BothFfiConstAndPure {
     pub attr_span: Span,
 }
 
+#[derive(Diagnostic)]
+#[diag("`#[optimize(none)]` cannot be used with `#[inline]` attributes")]
+pub(crate) struct BothOptimizeNoneAndInline {
+    #[primary_span]
+    #[label("`#[optimize(none)]` here")]
+    pub optimize_span: Span,
+    #[label("`#[inline]` here")]
+    pub inline_span: Span,
+}
+
 #[derive(Diagnostic)]
 #[diag("attribute should be applied to an `extern` block with non-Rust ABI")]
 #[warning(

tests/ui/attributes/optimize.rs

@@ -62,3 +62,15 @@ fn duplicate_same() {}
 #[optimize(speed)]
 #[optimize(size)] //~ ERROR multiple `optimize` attributes
 fn duplicate_different() {}
+
+#[optimize(none)] //~ ERROR `#[optimize(none)]` cannot be used with `#[inline]` attributes
+#[inline]
+fn inline_conflict_a() {}
+
+#[inline(always)]
+#[optimize(none)] //~ ERROR `#[optimize(none)]` cannot be used with `#[inline]` attributes
+fn inline_conflict_b() {}
+
+#[inline(never)]
+#[optimize(none)]
+fn inline_conflict_c() {}

tests/ui/attributes/optimize.stderr

@@ -62,5 +62,21 @@ note: attribute also specified here
 LL | #[optimize(speed)]
    | ^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 7 previous errors
+error: `#[optimize(none)]` cannot be used with `#[inline]` attributes
+  --> $DIR/optimize.rs:66:1
+   |
+LL | #[optimize(none)]
+   | ^^^^^^^^^^^^^^^^^ `#[optimize(none)]` here
+LL | #[inline]
+   | --------- `#[inline]` here
+
+error: `#[optimize(none)]` cannot be used with `#[inline]` attributes
+  --> $DIR/optimize.rs:71:1
+   |
+LL | #[inline(always)]
+   | ----------------- `#[inline]` here
+LL | #[optimize(none)]
+   | ^^^^^^^^^^^^^^^^^ `#[optimize(none)]` here
+
+error: aborting due to 9 previous errors