Convert the AttrBuilder into a list of Attributes instead of one Attribute object that holds all of its attributes.

llvm-svn: 173742

1 files changed, 15 insertions, 2 deletions

diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp
index 0bc926271ae..d947ffffd8f 100644
--- a/llvm/lib/IR/Attributes.cpp
+++ b/llvm/lib/IR/Attributes.cpp
@@ -445,8 +445,21 @@ AttributeSet AttributeSet::get(LLVMContext &C,
 AttributeSet AttributeSet::get(LLVMContext &C, unsigned Idx, AttrBuilder &B) {
   if (!B.hasAttributes())
     return AttributeSet();
-  return get(C, ArrayRef<std::pair<unsigned, Attribute> >(
-               std::make_pair(Idx, Attribute::get(C, B))));
+
+  SmallVector<std::pair<unsigned, Attribute>, 8> Attrs;
+  for (AttrBuilder::iterator I = B.begin(), E = B.end(); I != E; ++I) {
+    Attribute::AttrKind Kind = *I;
+    if (Kind == Attribute::Alignment)
+      Attrs.push_back(std::make_pair(Idx, Attribute::
+                                     getWithAlignment(C, B.getAlignment())));
+    else if (Kind == Attribute::StackAlignment)
+      Attrs.push_back(std::make_pair(Idx, Attribute::
+                              getWithStackAlignment(C, B.getStackAlignment())));
+    else
+      Attrs.push_back(std::make_pair(Idx, Attribute::get(C, Kind)));
+  }
+
+  return get(C, Attrs);
 }
 
 AttributeSet AttributeSet::get(LLVMContext &C, unsigned Idx,