Fix AttrSet struct for LLVM 3.1 and 3.2.

Use a map instead of a vector as the attribute index may get as
high as 0xFFFFFFFF (LLVM 3.1), apparently for function attributes.

Author: kinke

gen/attributes.cpp

@@ -60,48 +60,56 @@ AttrBuilder& AttrBuilder::remove(A attribute) {
 }
 
 
-void AttrSet::reserve(size_t length) {
-    entries.reserve(length);
-}
-
-AttrSet& AttrSet::add(size_t index, const AttrBuilder& builder) {
-    if (builder.hasAttributes()) {
-        if (index >= entries.size())
-            entries.resize(index + 1);
+AttrSet& AttrSet::add(unsigned index, AttrBuilder builder) {
+    if (builder.hasAttributes())
         entries[index] = builder;
-    }
     return *this;
 }
 
 #if LDC_LLVM_VER >= 303
 
 llvm::AttributeSet AttrSet::toNativeSet() const {
     llvm::AttributeSet set;
-    for (size_t i = 0; i < entries.size(); ++i) {
-        if (entries[i].hasAttributes()) {
-            AttrBuilder a = entries[i];
-            set = set.addAttributes(gIR->context(), i, llvm::AttributeSet::get(gIR->context(), i, a.attrs));
-        }
+
+    typedef std::map<unsigned, AttrBuilder>::const_iterator I;
+    for (I it = entries.begin(); it != entries.end(); ++it) {
+        unsigned index = it->first;
+        AttrBuilder builder = it->second;
+        if (!builder.hasAttributes())
+            continue;
+
+        llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(),
+            index, builder.attrs);
+        set = set.addAttributes(gIR->context(), index, as);
     }
+
     return set;
 }
 
 #else
 
 llvm::AttrListPtr AttrSet::toNativeSet() const {
+    if (entries.empty())
+        return llvm::AttrListPtr();
+
     std::vector<llvm::AttributeWithIndex> attrsWithIndex;
     attrsWithIndex.reserve(entries.size());
-    for (size_t i = 0; i < entries.size(); ++i) {
-        if (entries[i].hasAttributes()) {
+
+    typedef std::map<unsigned, AttrBuilder>::const_iterator I;
+    for (I it = entries.begin(); it != entries.end(); ++it) {
+        unsigned index = it->first;
+        AttrBuilder builder = it->second;
+        if (!builder.hasAttributes())
+            continue;
+
 #if LDC_LLVM_VER == 302
-            AttrBuilder a = entries[i];
-            attrsWithIndex.push_back(llvm::AttributeWithIndex::get(i,
-                llvm::Attributes::get(gIR->context(), a.attrs)));
+        attrsWithIndex.push_back(llvm::AttributeWithIndex::get(index,
+            llvm::Attributes::get(gIR->context(), builder.attrs)));
 #else
-            attrsWithIndex.push_back(llvm::AttributeWithIndex::get(i, entries[i].attrs));
+        attrsWithIndex.push_back(llvm::AttributeWithIndex::get(index, builder.attrs));
 #endif
-        }
     }
+
 #if LDC_LLVM_VER == 302
     return llvm::AttrListPtr::get(gIR->context(), llvm::ArrayRef<llvm::AttributeWithIndex>(attrsWithIndex));
 #else

gen/attributes.h

@@ -12,7 +12,7 @@
 
 #include "gen/llvm.h"
 
-#include <vector>
+#include <map>
 
 struct AttrBuilder
 {
@@ -42,10 +42,9 @@ struct AttrBuilder
 
 struct AttrSet
 {
-    std::vector<AttrBuilder> entries;
+    std::map<unsigned, AttrBuilder> entries;
 
-    void reserve(size_t length);
-    AttrSet& add(size_t index, const AttrBuilder& builder);
+    AttrSet& add(unsigned index, AttrBuilder builder);
 
 #if LDC_LLVM_VER >= 303
     llvm::AttributeSet toNativeSet() const;

gen/functions.cpp

@@ -538,11 +538,11 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
     {
         assert(Parameter::getNth(f->parameters, k));
 
-        AttrBuilder a = irFty.args[k]->attrs;
-        if (a.hasAttributes())
+        AttrBuilder builder = irFty.args[k]->attrs;
+        if (builder.hasAttributes())
         {
             unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
-            llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(), i, a.attrs);
+            llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(), i, builder.attrs);
             newAttrs = newAttrs.addAttributes(gIR->context(), i, as);
         }
     }
@@ -554,14 +554,15 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
 static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclaration* fdecl)
 {
     IrFuncTy &irFty = getIrFunc(fdecl)->irFty;
-    AttrSet attrs;
+    AttrSet set;
 
     int idx = 0;
 
     // handle implicit args
     #define ADD_PA(X) \
     if (irFty.X) { \
-        attrs.add(idx, irFty.X->attrs); \
+        if (irFty.X->attrs.hasAttributes()) \
+            set.add(idx, irFty.X->attrs); \
         idx++; \
     }
 
@@ -579,25 +580,29 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
     {
         assert(Parameter::getNth(f->parameters, k));
 
-        unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
-        attrs.add(i, irFty.args[k]->attrs);
+        AttrBuilder builder = irFty.args[k]->attrs;
+        if (builder.hasAttributes())
+        {
+            unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
+            set.add(i, builder);
+        }
     }
 
     // Merge in any old attributes (attributes for the function itself are
     // also stored in a list slot).
     llvm::AttrListPtr oldAttrs = func->getAttributes();
-    for (size_t i = 0; i < oldAttrs.getNumSlots(); ++i) {
-        llvm::AttributeWithIndex curr = oldAttrs.getSlot(i);
-        if (curr.Index >= attrs.entries.size())
-            attrs.entries.resize(curr.Index + 1);
+    for (unsigned i = 0; i < oldAttrs.getNumSlots(); ++i)
+    {
+        const llvm::AttributeWithIndex& curr = oldAttrs.getSlot(i);
+        AttrBuilder& builder = set.entries[curr.Index];
 #if LDC_LLVM_VER == 302
-        attrs.entries[curr.Index].attrs.addAttributes(curr.Attrs);
+        builder.attrs.addAttributes(curr.Attrs);
 #else
-        attrs.entries[curr.Index].attrs |= curr.Attrs;
+        builder.attrs |= curr.Attrs;
 #endif
     }
 
-    func->setAttributes(attrs.toNativeSet());
+    func->setAttributes(set.toNativeSet());
 }
 #endif
 

gen/tocall.cpp

@@ -294,8 +294,6 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
 
     // parameter attributes
     AttrSet attrs;
-    // return attributes + attributes for max 3 implicit args (sret, context, _arguments) & all explicit args
-    attrs.reserve(1 + 3 + n_arguments);
 
     // return attrs
     attrs.add(0, irFty.ret->attrs);