summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Vesely <jan.vesely@rutgers.edu>2020-01-30 01:23:54 -0500
committerDylan Baker <dylan@pnwbakers.com>2020-02-04 08:08:17 -0800
commitd78f3577e6b57c7a6bce0d621240dd3bf6edf663 (patch)
tree4c8b47e4967484f7ec9b16f7e9241d86b12886f4
parent7c5f6dd0efbeb220ac1bdd37638b2349922cfdd4 (diff)
clover: Use explicit conversion from llvm::StringRef to std::string
Fixes build after llvm 777180a32b61070a10dd330b4f038bf24e916af1 ("[ADT] Make StringRef's std::string conversion operator explicit") CC: <mesa-stable@lists.freedesktop.org> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Francisco Jerez <currojerez@riseup.net> (cherry picked from commit 0ccda2ebff83816cecf4dcb48f367a0d5c8f5fb1)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/state_trackers/clover/llvm/codegen/common.cpp3
-rw-r--r--src/gallium/state_trackers/clover/llvm/metadata.hpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json
index c94640f245c..bbb7b71b280 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -157,7 +157,7 @@
"description": "clover: Use explicit conversion from llvm::StringRef to std::string",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
index 3879fb61a02..dcb0032a839 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
@@ -197,8 +197,9 @@ clover::llvm::build_module_common(const Module &mod,
const clang::CompilerInstance &c) {
module m;
- for (const auto &name : map(std::mem_fn(&Function::getName),
+ for (const auto &llvm_name : map(std::mem_fn(&Function::getName),
get_kernels(mod))) {
+ const ::std::string name(llvm_name);
if (offsets.count(name))
m.syms.emplace_back(name, 0, offsets.at(name),
make_kernel_args(mod, name, c));
diff --git a/src/gallium/state_trackers/clover/llvm/metadata.hpp b/src/gallium/state_trackers/clover/llvm/metadata.hpp
index 5e8e720843d..58042f4b4da 100644
--- a/src/gallium/state_trackers/clover/llvm/metadata.hpp
+++ b/src/gallium/state_trackers/clover/llvm/metadata.hpp
@@ -62,7 +62,7 @@ namespace clover {
const std::string &name) {
return ::llvm::cast< ::llvm::MDString>(
detail::get_kernel_metadata_operands(f, name)[arg.getArgNo()])
- ->getString();
+ ->getString().str();
}
///