From 19f570bcb9479ed32c34a1caf13d64b5fc6ef0e7 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sat, 24 Nov 2012 12:39:07 +0100 Subject: [PATCH] AttrListPtr also requires the context arg in LLVM 3.2 now. --- gen/functions.cpp | 7 +++---- gen/tocall.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gen/functions.cpp b/gen/functions.cpp index 5e40162f..c74c8944 100644 --- a/gen/functions.cpp +++ b/gen/functions.cpp @@ -591,10 +591,9 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati } } -#if LDC_LLVM_VER >= 303 - llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(), llvm::ArrayRef(attrs)); -#elif LDC_LLVM_VER == 302 - llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(llvm::ArrayRef(attrs)); +#if LDC_LLVM_VER >= 302 + llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(), + llvm::ArrayRef(attrs)); #else llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(attrs.begin(), attrs.end()); #endif diff --git a/gen/tocall.cpp b/gen/tocall.cpp index ba4017ff..8aef0590 100644 --- a/gen/tocall.cpp +++ b/gen/tocall.cpp @@ -717,10 +717,9 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions* } // set calling convention and parameter attributes -#if LDC_LLVM_VER >= 303 - llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(), llvm::ArrayRef(attrs)); -#elif LDC_LLVM_VER == 302 - llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(llvm::ArrayRef(attrs)); +#if LDC_LLVM_VER >= 302 + llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(gIR->context(), + llvm::ArrayRef(attrs)); #else llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(attrs.begin(), attrs.end()); #endif