feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Require LLVM/Clang >= 5.0.0

Browse Source 
...for the code model parts and declare 5.0 as the supported version for
the clang static analyzer.

Adapt versions and tests, remove code assuming clang <= 5.0.

LLVM/Clang 5 was released on 07 Sep 2017.

Task-number: QTCREATORBUG-18931
Task-number: QTCREATORBUG-18657
Task-number: QTCREATORBUG-17187
Task-number: QTCREATORBUG-14881
Change-Id: I53b00258ca06a1d2e57f9379dacc54b310687295
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-09-29 13:46:53 +02:00
parent 6de3eb7a1a
commit 5ba40cb7fb
25 changed files with 85 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/clangrefactoringbackend/source/clangquery.cpp
View File

@@ -132,7 +132,7 @@ ClangQueryDiagnosticErrorType convertToErrorType(Diagnostics::ErrorType clangErr
ERROR_RETURN_CASE(ParserInvalidToken)
ERROR_RETURN_CASE(ParserMalformedBindExpr)
ERROR_RETURN_CASE(ParserTrailingCode)
ERROR_RETURN_CASE(ParserUnsignedError)
ERROR_RETURN_CASE(ParserNumberError)
ERROR_RETURN_CASE(ParserOverloadedType)
}

2
src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.cpp
View File

@@ -57,7 +57,7 @@ LocationSourceFileCallbacks::LocationSourceFileCallbacks(uint line,
{
}
bool LocationSourceFileCallbacks::handleBeginSource(clang::CompilerInstance &compilerInstance, llvm::StringRef /*fileName*/)
bool LocationSourceFileCallbacks::handleBeginSource(clang::CompilerInstance &compilerInstance)
{
auto &preprocessor = compilerInstance.getPreprocessor();

3
src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.h
View File

@@ -48,8 +48,7 @@ class LocationSourceFileCallbacks : public clang::tooling::SourceFileCallbacks
public:
LocationSourceFileCallbacks(uint line, uint column, FilePathCachingInterface &filePathCache);
bool handleBeginSource(clang::CompilerInstance &compilerInstance,
llvm::StringRef fileName) override;
bool handleBeginSource(clang::CompilerInstance &compilerInstance) override;
SourceLocationsContainer takeSourceLocations();
Utils::SmallString takeSymbolName();

7
src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.cpp
View File

@@ -82,11 +82,8 @@ void RefactoringCompilationDatabase::addFile(const std::string &directory,
const std::string &fileName,
const std::vector<std::string> &commandLine)
{
#if LLVM_VERSION_MAJOR >= 4
compileCommands.emplace_back(directory, fileName, commandLine, std::string());
#else
compileCommands.emplace_back(directory, fileName, commandLine);
#endif
compileCommands.emplace_back(directory, fileName, commandLine, llvm::StringRef());
}
} // namespace ClangBackEnd

6
src/tools/clangrefactoringbackend/source/sourcelocationsutils.h
View File

@@ -42,9 +42,11 @@ namespace ClangBackEnd {
inline
llvm::SmallString<256> absolutePath(clang::StringRef path)
{
llvm::SmallString<256> absolutePath(path);
llvm::SmallString<256> absolutePath;
if (!llvm::sys::path::is_absolute(absolutePath))
std::error_code errorCode = llvm::sys::fs::real_path(path, absolutePath, true);
if (!errorCode && !llvm::sys::path::is_absolute(absolutePath))
llvm::sys::fs::make_absolute(absolutePath);
return absolutePath;