[llvm-commits] [llvm] r173108 - /llvm/trunk/lib/IR/Attributes.cpp

[Bill Wendling]

Author: void
Date: Mon Jan 21 18:41:33 2013
New Revision: 173108

URL: http://llvm.org/viewvc/llvm-project?rev=173108&view=rev
Log:
Add the attributes that are passed in instead of the ones we're merging into.

Modified:
    llvm/trunk/lib/IR/Attributes.cpp

Modified: llvm/trunk/lib/IR/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=173108&r1=173107&r2=173108&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Attributes.cpp (original)
+++ llvm/trunk/lib/IR/Attributes.cpp Mon Jan 21 18:41:33 2013
@@ -693,12 +693,12 @@
 
 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,