From da6d5623aefeb3c77a610954c77605107e1532b8 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 22 Jan 2013 00:41:33 +0000 Subject: [PATCH] Add the attributes that are passed in instead of the ones we're merging into. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173108 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Attributes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp index 5c95d4a380a..fe6366de790 100644 --- a/lib/IR/Attributes.cpp +++ b/lib/IR/Attributes.cpp @@ -693,12 +693,12 @@ bool AttributeSet::hasAttrSomewhere(Attribute::AttrKind Attr) const { AttributeSet AttributeSet::addRetAttributes(LLVMContext &C, AttributeSet Attrs) const { - return addAttr(C, ReturnIndex, getAttributes(ReturnIndex)); + return addAttr(C, ReturnIndex, Attrs.getAttributes(ReturnIndex)); } AttributeSet AttributeSet::addFnAttributes(LLVMContext &C, AttributeSet Attrs) const { - return addAttr(C, FunctionIndex, getAttributes(FunctionIndex)); + return addAttr(C, FunctionIndex, Attrs.getAttributes(FunctionIndex)); } AttributeSet AttributeSet::addAttr(LLVMContext &C, unsigned Idx, -- 2.34.1