bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

AttrBuilder doesn't take a context in old LLVM

Browse source
This commit is contained in:
Erik Desjardins 2022-02-26 17:16:01 -05:00
parent ac9f4f7d0d
commit 0d0cc4f6a0
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
View file

@ -234,14 +234,17 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) {
template<typename T> static inline void AddAttributes(T *t, unsigned Index, template<typename T> static inline void AddAttributes(T *t, unsigned Index,
LLVMAttributeRef *Attrs, size_t AttrsLen) { LLVMAttributeRef *Attrs, size_t AttrsLen) {
AttrBuilder B(t->getContext());
for (LLVMAttributeRef Attr : makeArrayRef(Attrs, AttrsLen))
B.addAttribute(unwrap(Attr));
AttributeList PAL = t->getAttributes(); AttributeList PAL = t->getAttributes();
AttributeList PALNew; AttributeList PALNew;
#if LLVM_VERSION_LT(14, 0) #if LLVM_VERSION_LT(14, 0)
AttrBuilder B;
for (LLVMAttributeRef Attr : makeArrayRef(Attrs, AttrsLen))
B.addAttribute(unwrap(Attr));
PALNew = PAL.addAttributes(t->getContext(), Index, B); PALNew = PAL.addAttributes(t->getContext(), Index, B);
#else #else
AttrBuilder B(t->getContext());
for (LLVMAttributeRef Attr : makeArrayRef(Attrs, AttrsLen))
B.addAttribute(unwrap(Attr));
PALNew = PAL.addAttributesAtIndex(t->getContext(), Index, B); PALNew = PAL.addAttributesAtIndex(t->getContext(), Index, B);
#endif #endif
t->setAttributes(PALNew); t->setAttributes(PALNew);
@ -253,7 +256,7 @@ template<typename T> static inline void RemoveAttributes(T *t, unsigned Index,
AttributeList PAL = t->getAttributes(); AttributeList PAL = t->getAttributes();
AttributeList PALNew; AttributeList PALNew;
#if LLVM_VERSION_LT(14, 0) #if LLVM_VERSION_LT(14, 0)
AttrBuilder B(t->getContext()); AttrBuilder B;
for (LLVMRustAttribute RustAttr : makeArrayRef(RustAttrs, RustAttrsLen)) for (LLVMRustAttribute RustAttr : makeArrayRef(RustAttrs, RustAttrsLen))
B.addAttribute(fromRust(RustAttr)); B.addAttribute(fromRust(RustAttr));
PALNew = PAL.removeAttributes(t->getContext(), Index, B); PALNew = PAL.removeAttributes(t->getContext(), Index, B);