Mesa (master): ac: fix build after LLVM 5.0 SVN r300718
Nicolai Hähnle
nh at kemper.freedesktop.org
Thu Apr 20 08:58:52 UTC 2017
Module: Mesa
Branch: master
Commit: a9d27c8a33a4aef9b71f716cd08ad3d52bc1591c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9d27c8a33a4aef9b71f716cd08ad3d52bc1591c
Author: Christoph Haag <haagch+mesadev at frickel.club>
Date: Thu Apr 20 10:34:18 2017 +0200
ac: fix build after LLVM 5.0 SVN r300718
v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type
Signed-off-by: Christoph Haag <haagch+mesadev at frickel.club>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Tested-and-reviewed-by: Mike Lothian <mike at fireburn.co.uk>
---
src/amd/common/ac_llvm_helper.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp
index d9ea4b162e..11fa80920d 100644
--- a/src/amd/common/ac_llvm_helper.cpp
+++ b/src/amd/common/ac_llvm_helper.cpp
@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList;
void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes)
{
llvm::Argument *A = llvm::unwrap<llvm::Argument>(val);
+#if HAVE_LLVM < 0x0500
llvm::AttrBuilder B;
B.addDereferenceableAttr(bytes);
A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1, B));
+#else
+ A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes));
+#endif
}
bool ac_is_sgpr_param(LLVMValueRef arg)
More information about the mesa-commit
mailing list