AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HIPIFY] Fix build failure against ToT trunk LLVM 11.0.0

Browse Source 
+ Add an explicit cast when assigning StringRef to std::string


[ROCm/hip commit: 58906beac9]
This commit is contained in:
Evgeny Mankov
2020-02-01 14:41:16 +03:00
parent 61156d3b2d
commit 3f524b4e17
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/hipify-clang/src/HipifyAction.cpp
+2 -2
View File
@@ -213,7 +213,7 @@ StringRef readSourceText(clang::SourceManager &SM, const clang::SourceRange &exp
*/ */
std::string stringifyZeroDefaultedArg(clang::SourceManager &SM, const clang::Expr *arg) { std::string stringifyZeroDefaultedArg(clang::SourceManager &SM, const clang::Expr *arg) {
if (clang::isa<clang::CXXDefaultArgExpr>(arg)) return "0"; if (clang::isa<clang::CXXDefaultArgExpr>(arg)) return "0";
else return readSourceText(SM, arg->getSourceRange()); else return std::string(readSourceText(SM, arg->getSourceRange()));
} }
} // anonymous namespace } // anonymous namespace
@@ -427,7 +427,7 @@ bool HipifyAction::cudaSharedIncompleteArrayVar(const mat::MatchFinder::MatchRes
clang::LangOptions LO; clang::LangOptions LO;
LO.CUDA = true; LO.CUDA = true;
clang::PrintingPolicy policy(LO); clang::PrintingPolicy policy(LO);
typeName = BT->getName(policy); typeName = std::string(BT->getName(policy));
} }
} else { } else {
typeName = QT.getAsString(); typeName = QT.getAsString();
projects/hip/hipify-clang/src/LLVMCompat.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ ct::Replacements &getReplacements(ct::RefactoringTool &Tool, StringRef file) {
#if LLVM_VERSION_MAJOR > 3 #if LLVM_VERSION_MAJOR > 3
// getReplacements() now returns a map from filename to Replacements - so create an entry // getReplacements() now returns a map from filename to Replacements - so create an entry
// for this source file and return a reference to it. // for this source file and return a reference to it.
return Tool.getReplacements()[file]; return Tool.getReplacements()[std::string(file)];
#else #else
return Tool.getReplacements(); return Tool.getReplacements();
#endif #endif
projects/hip/hipify-clang/src/main.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ void appendArgumentsAdjusters(ct::RefactoringTool &Tool, const std::string &sSou
// Includes for clang's CUDA wrappers for using by packaged hipify-clang // Includes for clang's CUDA wrappers for using by packaged hipify-clang
static int Dummy; static int Dummy;
std::string hipify = llvm::sys::fs::getMainExecutable(hipify_exe, (void *)&Dummy); std::string hipify = llvm::sys::fs::getMainExecutable(hipify_exe, (void *)&Dummy);
std::string clang_inc_path = llvm::sys::path::parent_path(hipify); std::string clang_inc_path = std::string(llvm::sys::path::parent_path(hipify));
clang_inc_path.append("/include"); clang_inc_path.append("/include");
Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(clang_inc_path.c_str(), ct::ArgumentInsertPosition::BEGIN)); Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(clang_inc_path.c_str(), ct::ArgumentInsertPosition::BEGIN));
Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-isystem", ct::ArgumentInsertPosition::BEGIN)); Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-isystem", ct::ArgumentInsertPosition::BEGIN));