Add the attributes that are passed in instead of the ones we're merging into.
authorBill Wendling <isanbard@gmail.com>
Tue, 22 Jan 2013 00:41:33 +0000 (00:41 +0000)
committerBill Wendling <isanbard@gmail.com>
Tue, 22 Jan 2013 00:41:33 +0000 (00:41 +0000)
commitda6d5623aefeb3c77a610954c77605107e1532b8
treebdd12dc65ff6257510cc20ec55863d323f699710
parent0d8c5fb91d9240f14246803200c0110e25e849d8
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