From ff002524c12471668e63837a804b6006f9136a34 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 29 May 2018 11:28:07 +0200 Subject: compilerplugins: try to make these work with icecream There are some problems here, this should fix one of them: the getFilename function returns "" 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 "", 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 --- compilerplugins/clang/expressionalwayszero.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compilerplugins/clang/expressionalwayszero.cxx') diff --git a/compilerplugins/clang/expressionalwayszero.cxx b/compilerplugins/clang/expressionalwayszero.cxx index 6633f138cfb3..0f0eb7a541e6 100644 --- a/compilerplugins/clang/expressionalwayszero.cxx +++ b/compilerplugins/clang/expressionalwayszero.cxx @@ -35,8 +35,9 @@ public: virtual void run() override { - std::string fn( compiler.getSourceManager().getFileEntryForID( - compiler.getSourceManager().getMainFileID())->getName() ); + // don't use getMainFileID, it may return "" + std::string fn(handler.getMainFileName()); + loplugin::normalizeDotDotInFilePath(fn); // encoding of constant value for binary file format if (startswith(fn, SRCDIR "/package/source/zipapi/ZipFile.cxx")) -- cgit