ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for Clang 10 compatibility (closes #965) (#968)

Browse Source 
Primarily FrontendAction now gets passed as unique_ptr, but also StringRef was added in a few places. See https://releases.llvm.org/10.0.0/tools/clang/docs/ReleaseNotes.html#internal-api-changes and http://llvm.org/docs/ProgrammersManual.html#the-stringref-class Also, llvm::make_unique is now std::make_unique: https://reviews.llvm.org/D66259 because LLVM requires C++14.
This commit is contained in:
Louis St-Amour
2020-06-07 16:18:58 +02:00
committed by GitHub
parent 43a6b1308b
commit a12deb2056
17 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_cxx/data/parser/cxx/CxxParser.cpp
+4 -4
View File
@@ -41,7 +41,7 @@ std::vector<std::string> appendFilePath(const std::vector<std::string>& args, ll
// custom implementation of clang::runToolOnCodeWithArgs which also sets our custon DiagnosticConsumer
bool runToolOnCodeWithArgs(
clang::DiagnosticConsumer* DiagConsumer,
clang::FrontendAction* ToolAction,
std::unique_ptr<clang::FrontendAction> ToolAction,
const llvm::Twine& Code,
const std::vector<std::string>& Args,
const llvm::Twine& FileName = "input.cc",
@@ -62,7 +62,7 @@ bool runToolOnCodeWithArgs(
new clang::FileManager(clang::FileSystemOptions(), OverlayFileSystem));
clang::tooling::ToolInvocation Invocation(
prependSyntaxOnlyToolArgs(appendFilePath(Args, FileNameRef)), ToolAction, Files.get());
prependSyntaxOnlyToolArgs(appendFilePath(Args, FileNameRef)), std::move(ToolAction), Files.get());
llvm::SmallString<1024> CodeStorage;
llvm::StringRef CodeRef = Code.toNullTerminatedStringRef(CodeStorage);
@@ -155,13 +155,13 @@ void CxxParser::buildIndex(
std::shared_ptr<CxxDiagnosticConsumer> diagnostics = getDiagnostics(
FilePath(), canonicalFilePathCache, false);
clang::ASTFrontendAction* action = new ASTAction(
std::unique_ptr<clang::ASTFrontendAction> action = std::make_unique<ASTAction>(
m_client, canonicalFilePathCache, m_indexerStateInfo);
std::vector<std::string> args = getCommandlineArgumentsEssential(compilerFlags);
runToolOnCodeWithArgs(
diagnostics.get(), action, fileContent->getText(), args, utility::encodeToUtf8(fileName));
diagnostics.get(), std::move(action), fileContent->getText(), args, utility::encodeToUtf8(fileName));
}
void CxxParser::runTool(