6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-17 21:35:07 +00:00
Code Issues Projects Releases Wiki Activity

Add the attributes that are passed in instead of the ones we're merging into.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173108 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-01-22 00:41:33 +00:00
parent 0d8c5fb91d
commit da6d5623ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/IR/Attributes.cpp
View File

@ -693,12 +693,12 @@ bool AttributeSet::hasAttrSomewhere(Attribute::AttrKind Attr) const {
AttributeSet AttributeSet::addRetAttributes(LLVMContext &C, AttributeSet AttributeSet::addRetAttributes(LLVMContext &C,
AttributeSet Attrs) const { AttributeSet Attrs) const {
return addAttr(C, ReturnIndex, getAttributes(ReturnIndex)); return addAttr(C, ReturnIndex, Attrs.getAttributes(ReturnIndex));
} }
AttributeSet AttributeSet::addFnAttributes(LLVMContext &C, AttributeSet AttributeSet::addFnAttributes(LLVMContext &C,
AttributeSet Attrs) const { AttributeSet Attrs) const {
return addAttr(C, FunctionIndex, getAttributes(FunctionIndex)); return addAttr(C, FunctionIndex, Attrs.getAttributes(FunctionIndex));
} }
AttributeSet AttributeSet::addAttr(LLVMContext &C, unsigned Idx, AttributeSet AttributeSet::addAttr(LLVMContext &C, unsigned Idx,