fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clover: Use explicit conversion from llvm::StringRef to std::string

Browse source 
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>
This commit is contained in:
Jan Vesely 2020-01-30 01:23:54 -05:00
parent 5d83314945
commit 0ccda2ebff
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/state_trackers/clover/llvm/codegen/common.cpp
View file

@ -196,8 +196,9 @@ clover::llvm::build_module_common(const Module &mod,
const clang::CompilerInstance &c) { const clang::CompilerInstance &c) {
module m; 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))) { get_kernels(mod))) {
const ::std::string name(llvm_name);
if (offsets.count(name)) if (offsets.count(name))
m.syms.emplace_back(name, 0, offsets.at(name), m.syms.emplace_back(name, 0, offsets.at(name),
make_kernel_args(mod, name, c)); make_kernel_args(mod, name, c));

2
src/gallium/state_trackers/clover/llvm/metadata.hpp
View file

@ -62,7 +62,7 @@ namespace clover {
const std::string &name) { const std::string &name) {
return ::llvm::cast< ::llvm::MDString>( return ::llvm::cast< ::llvm::MDString>(
detail::get_kernel_metadata_operands(f, name)[arg.getArgNo()]) detail::get_kernel_metadata_operands(f, name)[arg.getArgNo()])
->getString(); ->getString().str();
} }
/// ///