From ac9f4f7d0de3986246a19678919ff15252870b15 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Sat, 26 Feb 2022 16:58:45 -0500 Subject: [PATCH] use attrbuilder to remove attrs in old LLVM --- compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 632a7985c79..1ba54ca0779 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -250,14 +250,17 @@ template static inline void AddAttributes(T *t, unsigned Index, template static inline void RemoveAttributes(T *t, unsigned Index, LLVMRustAttribute *RustAttrs, size_t RustAttrsLen) { - AttributeMask Mask; - for (LLVMRustAttribute RustAttr : makeArrayRef(RustAttrs, RustAttrsLen)) - Mask.addAttribute(fromRust(RustAttr)); AttributeList PAL = t->getAttributes(); AttributeList PALNew; #if LLVM_VERSION_LT(14, 0) - PALNew = PAL.removeAttributes(t->getContext(), Index, Mask); + AttrBuilder B(t->getContext()); + for (LLVMRustAttribute RustAttr : makeArrayRef(RustAttrs, RustAttrsLen)) + B.addAttribute(fromRust(RustAttr)); + PALNew = PAL.removeAttributes(t->getContext(), Index, B); #else + AttributeMask Mask; + for (LLVMRustAttribute RustAttr : makeArrayRef(RustAttrs, RustAttrsLen)) + Mask.addAttribute(fromRust(RustAttr)); PALNew = PAL.removeAttributesAtIndex(t->getContext(), Index, Mask); #endif t->setAttributes(PALNew);