commit: a283a68e01eee195c32fb3fe69808ff5111ed6c5
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 06:01:14 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 06:01:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a283a68e
dev-util/bpftrace-0.9.4: Fix build with llvm-10
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-util/bpftrace/bpftrace-0.9.4.ebuild | 1 +
.../bpftrace/files/bpftrace-0.9.4-llvm-10.patch | 144 +++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
index 0afc8a9890f..ad25d1221e1 100644
--- a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
+ "${FILESDIR}/bpftrace-0.9.4-llvm-10.patch"
"${FILESDIR}/bpftrace-0.9.4-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
)
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
new file mode 100644
index 00000000000..c2131cbbc30
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
@@ -0,0 +1,144 @@
+diff --git a/src/ast/codegen_llvm.cpp b/src/ast/codegen_llvm.cpp
+index f81906c..bcc2c7d 100644
+--- a/src/ast/codegen_llvm.cpp
++++ b/src/ast/codegen_llvm.cpp
+@@ -41,7 +41,7 @@ void CodegenLLVM::visit(PositionalParameter ¶m)
+ {
+ Constant *const_str =
ConstantDataArray::getString(module_->getContext(), pstr, true);
+ AllocaInst *buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(),
pstr.length() + 1), "str");
+- b_.CreateMemSet(buf, b_.getInt8(0), pstr.length() + 1, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), pstr.length() + 1, 1);
+ b_.CreateStore(const_str, buf);
+ expr_ = buf;
+ }
+@@ -156,7 +156,7 @@ void CodegenLLVM::visit(Builtin &builtin)
+ {
+ AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "comm");
+ // initializing memory needed for older kernels:
+- b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
+ b_.CreateGetCurrentComm(buf, builtin.type.size);
+ expr_ = buf;
+ }
+@@ -189,7 +189,7 @@ void CodegenLLVM::visit(Builtin &builtin)
+ if (builtin.type.type == Type::usym)
+ {
+ AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "func");
+- b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
+ Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
+ Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
+ Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
+@@ -444,7 +444,7 @@ void CodegenLLVM::visit(Call &call)
+ else if (call.func == "str")
+ {
+ AllocaInst *strlen = b_.CreateAllocaBPF(b_.getInt64Ty(), "strlen");
+- b_.CreateMemSet(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
++ b_.CREATE_MEMSET(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
+ if (call.vargs->size() > 1) {
+ call.vargs->at(1)->accept(*this);
+ Value *proposed_strlen = b_.CreateAdd(expr_, b_.getInt64(1)); // add 1
to accommodate probe_read_str's null byte
+@@ -462,7 +462,7 @@ void CodegenLLVM::visit(Call &call)
+ b_.CreateStore(b_.getInt64(bpftrace_.strlen_), strlen);
+ }
+ AllocaInst *buf = b_.CreateAllocaBPF(bpftrace_.strlen_, "str");
+- b_.CreateMemSet(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
+ call.vargs->front()->accept(*this);
+ b_.CreateProbeReadStr(buf, b_.CreateLoad(strlen), expr_);
+ b_.CreateLifetimeEnd(strlen);
+@@ -541,7 +541,7 @@ void CodegenLLVM::visit(Call &call)
+ {
+ // store uint64_t[2] with: [0]: (uint64_t)addr, [1]: (uint64_t)pid
+ AllocaInst *buf = b_.CreateAllocaBPF(call.type, "usym");
+- b_.CreateMemSet(buf, b_.getInt8(0), call.type.size, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), call.type.size, 1);
+ Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
+ Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
+ Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
+@@ -592,7 +592,7 @@ void CodegenLLVM::visit(Call &call)
+ b_.CreateStore(af_type, af_offset);
+
+ Value *inet_offset = b_.CreateGEP(buf, {b_.getInt32(0), b_.getInt32(1)});
+- b_.CreateMemSet(inet_offset, b_.getInt8(0), 16, 1);
++ b_.CREATE_MEMSET(inet_offset, b_.getInt8(0), 16, 1);
+
+ inet->accept(*this);
+ if (inet->type.type == Type::array)
+@@ -663,7 +663,7 @@ void CodegenLLVM::visit(Call &call)
+ auto &map = static_cast<Map&>(arg);
+ Constant *const_str = ConstantDataArray::getString(module_->getContext(),
map.ident, true);
+ AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(),
map.ident.length() + 1), "str");
+- b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
++ b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
+ b_.CreateStore(const_str, str_buf);
+ ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(),
sizeof(uint64_t) + 2 * sizeof(uint64_t) + map.ident.length() + 1);
+ AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata");
+@@ -707,7 +707,7 @@ void CodegenLLVM::visit(Call &call)
+ auto &map = static_cast<Map&>(arg);
+ Constant *const_str = ConstantDataArray::getString(module_->getContext(),
map.ident, true);
+ AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(),
map.ident.length() + 1), "str");
+- b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
++ b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
+ b_.CreateStore(const_str, str_buf);
+ ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(),
sizeof(uint64_t) + map.ident.length() + 1);
+ AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata");
+@@ -1204,7 +1204,7 @@ void CodegenLLVM::visit(FieldAccess &acc)
+ {
+ AllocaInst *dst = b_.CreateAllocaBPF(field.type, type.cast_type + "." +
acc.field);
+ // memset so verifier doesn't complain about reading uninitialized stack
+- b_.CreateMemSet(dst, b_.getInt8(0), field.type.size, 1);
++ b_.CREATE_MEMSET(dst, b_.getInt8(0), field.type.size, 1);
+ b_.CreateProbeRead(dst, field.bitfield.read_bytes, src);
+ Value *raw = b_.CreateLoad(dst);
+ Value *shifted = b_.CreateLShr(raw, field.bitfield.access_rshift);
+@@ -1906,7 +1906,7 @@ void CodegenLLVM::createFormatStringCall(Call &call, int
&id, CallArgs &call_arg
+ }
+
+ AllocaInst *fmt_args = b_.CreateAllocaBPF(fmt_struct, call_name + "_args");
+- b_.CreateMemSet(fmt_args, b_.getInt8(0), struct_size, 1);
++ b_.CREATE_MEMSET(fmt_args, b_.getInt8(0), struct_size, 1);
+
+ Value *id_offset = b_.CreateGEP(fmt_args, {b_.getInt32(0), b_.getInt32(0)});
+ b_.CreateStore(b_.getInt64(id + asyncactionint(async_action)), id_offset);
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index eb84f7b..5dd72d0 100644
+--- a/src/ast/irbuilderbpf.cpp
++++ b/src/ast/irbuilderbpf.cpp
+@@ -82,7 +82,7 @@ AllocaInst *IRBuilderBPF::CreateAllocaBPFInit(const
SizedType &stype, const std:
+ }
+ else
+ {
+- CreateMemSet(alloca, getInt64(0), stype.size, 1);
++ CREATE_MEMSET(alloca, getInt64(0), stype.size, 1);
+ }
+
+ restoreIP(ip);
+@@ -226,7 +226,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(int mapfd,
AllocaInst *key, SizedType &
+
+ SetInsertPoint(lookup_failure_block);
+ if (is_array)
+- CreateMemSet(value, getInt8(0), type.size, 1);
++ CREATE_MEMSET(value, getInt8(0), type.size, 1);
+ else
+ CreateStore(getInt64(0), value);
+ CreateBr(lookup_merge_block);
+diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h
+index 58e6882..6b2e7f1 100644
+--- a/src/ast/irbuilderbpf.h
++++ b/src/ast/irbuilderbpf.h
+@@ -18,6 +18,14 @@
+ #error Unsupported LLVM version
+ #endif
+
++#if LLVM_VERSION_MAJOR >= 10
++#define CREATE_MEMSET(ptr, val, size, align)
\
++ CreateMemSet((ptr), (val), (size), MaybeAlign((align)))
++#else
++#define CREATE_MEMSET(ptr, val, size, align)
\
++ CreateMemSet((ptr), (val), (size), (align))
++#endif
++
+ namespace bpftrace {
+ namespace ast {
+
