summaryrefslogtreecommitdiff
path: root/compilerplugins/clang/staticmethods.cxx
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-05-29 11:28:07 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-07-06 14:12:58 +0200
commitff002524c12471668e63837a804b6006f9136a34 (patch)
treea1dabcdde981ca377809b9a720ab01b71b3b21fb /compilerplugins/clang/staticmethods.cxx
parent243f7d73a0b6ef9cea63bfcca0a07aa9c19e259c (diff)
compilerplugins: try to make these work with icecream
There are some problems here, this should fix one of them: the getFilename function returns "<stdin>" for spelling locations, because the input to clang is sort of preprocessed via -frewrite-includes if icecream is used and the file is built on a remote host (whereas it's apparently not preprocessed if the file is compiled locally by icecream). Using getPresumedLoc() uses the #line directives in the preprocessed input, which avoids the problem but is more expensive, so try to use it only when necessary. The getFileEntry(getMainFileID())->getName() pattern will also result in "<stdin>", but fortunately icecream passes -main-file-name, which oddly enough isn't used by the SourceManager's spelling locations, but is available separately via CodeGenOptions. This builds everything successfully with clang version 6.0.0: ICECC_PREFERRED_HOST=myremote make check gb_SUPPRESS_TESTS=t Change-Id: Ic121511683e5302d7b9d85186c8b9c4a5443fa1b Reviewed-on: https://gerrit.libreoffice.org/54993 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'compilerplugins/clang/staticmethods.cxx')
-rw-r--r--compilerplugins/clang/staticmethods.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 50d432081f00..aa1b97e01015 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -60,7 +60,7 @@ bool isDerivedFromTestFixture(const CXXRecordDecl *decl) {
StringRef StaticMethods::getFilename(SourceLocation loc)
{
SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(loc);
- return compiler.getSourceManager().getFilename(spellingLocation);
+ return getFileNameOfSpellingLoc(spellingLocation);
}
bool startsWith(const std::string& rStr, const char* pSubStr) {