From 186d91daf73188357d569b41906aa5f44a55dfba Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 25 Sep 2025 16:36:51 +0200 Subject: Revert "Auto merge of #144086 - clubby789:alloc-zeroed, r=nikic" This reverts commit 040a98af70f0a7da03f3d5356531b28a2a7a77e4, reversing changes made to e8a792daf500b5ff8097896ddb6cc037abe92487. --- compiler/rustc_codegen_llvm/src/attributes.rs | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src') diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs index 573c51a9539..bdc025cd955 100644 --- a/compiler/rustc_codegen_llvm/src/attributes.rs +++ b/compiler/rustc_codegen_llvm/src/attributes.rs @@ -435,16 +435,6 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>( || codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR_ZEROED) { to_add.push(create_alloc_family_attr(cx.llcx)); - if let Some(zv) = - cx.tcx.get_attr(instance.def_id(), rustc_span::sym::rustc_allocator_zeroed_variant) - && let Some(name) = zv.value_str() - { - to_add.push(llvm::CreateAttrStringValue( - cx.llcx, - "alloc-variant-zeroed", - &mangle_internal_symbol(cx.tcx, name.as_str()), - )); - } // apply to argument place instead of function let alloc_align = AttributeKind::AllocAlign.create_attr(cx.llcx); attributes::apply_to_llfn(llfn, AttributePlace::Argument(1), &[alloc_align]); -- cgit 1.4.1-3-g733a5