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)
commit360a4ae48ea12bf4e6ad77bc70888b3242a93add
treee11e3cc7f7a295dec6e2da607cdb212009e97ce2
parent8e44d749f762b576d01101d23053e9fe8606bcfb
Add the attributes that are passed in instead of the ones we're merging into.

llvm-svn: 173108
llvm/lib/IR/Attributes.cpp