Rollup of 12 pull requests

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -223,13 +223,6 @@ pub(crate) enum OnDuplicate {
 
     /// Ignore duplicates
     Ignore,
-
-    /// Custom function called when a duplicate attribute is found.
-    ///
-    /// - `unused` is the span of the attribute that was unused or bad because of some
-    ///   duplicate reason
-    /// - `used` is the span of the attribute that was used in favor of the unused attribute
-    Custom(fn(cx: &AcceptContext<'_, '_>, used: Span, unused: Span)),
 }
 
 impl OnDuplicate {
@@ -252,7 +245,6 @@ impl OnDuplicate {
                 });
             }
             OnDuplicate::Ignore => {}
-            OnDuplicate::Custom(f) => f(cx, used, unused),
         }
     }
 }

compiler/rustc_attr_parsing/src/attributes/transparency.rs

@@ -7,9 +7,7 @@ pub(crate) struct RustcMacroTransparencyParser;
 
 impl SingleAttributeParser for RustcMacroTransparencyParser {
     const PATH: &[Symbol] = &[sym::rustc_macro_transparency];
-    const ON_DUPLICATE: OnDuplicate = OnDuplicate::Custom(|cx, used, unused| {
-        cx.dcx().span_err(vec![used, unused], "multiple macro transparency attributes");
-    });
+    const ON_DUPLICATE: OnDuplicate = OnDuplicate::Error;
     const STABILITY: AttributeStability = unstable!(rustc_attrs);
     const ALLOWED_TARGETS: AllowedTargets<'_> =
         AllowedTargets::AllowList(&[Allow(Target::MacroDef)]);

compiler/rustc_codegen_ssa/src/mir/debuginfo.rs

@@ -10,7 +10,7 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
 use rustc_middle::ty::{Instance, Ty};
 use rustc_middle::{bug, mir, ty};
-use rustc_session::config::{DebugInfo, OptLevel};
+use rustc_session::config::DebugInfo;
 use rustc_span::{BytePos, DUMMY_SP, Span, Symbol, hygiene, sym};
 
 use super::operand::{OperandRef, OperandValue};
@@ -460,18 +460,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             LocalRef::UnsizedPlace(_) => return,
         };
 
-        // FIXME(arm-maintainers): LLVM uses GlobalISel with -O0 that doesn't support scalable
-        // vectors. It normally falls back to SDAG which does support scalable vectors, but there's
-        // a bug that means that isn't happening for debuginfo - so temporarily don't emit debuginfo
-        // for scalable vector locals when there are no optimisations until that bug is
-        // fixed. See <https://github.com/llvm/llvm-project/issues/204585>.
-        if base.layout.peel_transparent_wrappers(bx).ty.is_scalable_vector()
-            && bx.tcx().backend_optimization_level(()) == OptLevel::No
-            && bx.sess().opts.debuginfo != DebugInfo::None
-        {
-            return;
-        }
-
         let vars = vars.iter().cloned().chain(fallback_var);
 
         for var in vars {