AttrListPtr is renamed to AttributeSet in LLVM 3.3.

ldc-developers · Dec 9, 2012 · 1a06130 · 1a06130
1 parent b92c461
commit 1a06130
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/gen/functions.cpp b/gen/functions.cpp
@@ -567,7 +567,11 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
     // Merge in any old attributes (attributes for the function itself are
     // also stored in a list slot).
     const size_t newSize = attrs.size();
+#if LDC_LLVM_VER >= 303
+    llvm::AttributeSet oldAttrs = func->getAttributes();
+#else
     llvm::AttrListPtr oldAttrs = func->getAttributes();
+#endif
     for (size_t i = 0; i < oldAttrs.getNumSlots(); ++i) {
         llvm::AttributeWithIndex curr = oldAttrs.getSlot(i);
 
@@ -591,7 +595,10 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
         }
     }
 
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+	llvm::AttributeSet attrlist = llvm::AttributeSet::get(gIR->context(),
+        llvm::ArrayRef<llvm::AttributeWithIndex>(attrs));
+#elif LDC_LLVM_VER >= 302
 	llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(),
         llvm::ArrayRef<llvm::AttributeWithIndex>(attrs));
 #else

diff --git a/gen/llvmhelpers.h b/gen/llvmhelpers.h
@@ -191,7 +191,11 @@ LLValue* DtoCallableValue(DValue* fn);
 LLFunctionType* DtoExtractFunctionType(LLType* type);
 
 ///
+#if LDC_LLVM_VER >= 303
+void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::AttributeSet& palist, TypeFunction* tf, Expressions* arguments, size_t argidx);
+#else
 void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::AttrListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx);
+#endif
 
 ///
 DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions* arguments);

diff --git a/gen/runtime.cpp b/gen/runtime.cpp
@@ -220,7 +220,11 @@ static void LLVM_D_BuildRuntimeModule()
 
     // Construct some attribute lists used below (possibly multiple times)
 #if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+    llvm::AttributeSet
+#else
     llvm::AttrListPtr
+#endif
         NoAttrs,
         Attr_NoAlias
         = NoAttrs.addAttr(gIR->context(), 0, llvm::Attributes::get(gIR->context(), llvm::AttrBuilder().addAttribute(llvm::Attributes::NoAlias))),

diff --git a/gen/tocall.cpp b/gen/tocall.cpp
@@ -717,7 +717,10 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
     }
 
     // set calling convention and parameter attributes
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+	llvm::AttributeSet attrlist = llvm::AttributeSet::get(gIR->context(),
+        llvm::ArrayRef<llvm::AttributeWithIndex>(attrs));
+#elif LDC_LLVM_VER == 302
 	llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(),
         llvm::ArrayRef<llvm::AttributeWithIndex>(attrs));
 #else