mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilerplugins: try to make these work with icecream

Browse Source 
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>
This commit is contained in:
Michael Stahl
2018-05-29 11:28:07 +02:00
committed by Thorsten Behrens
parent 243f7d73a0
commit ff002524c1
34 changed files with 103 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compilerplugins/clang/pluginhandler.cxx
View File

@@ -55,9 +55,21 @@ static int pluginCount = 0;
static bool bPluginObjectsCreated = false;
static bool unitTestMode = false;
StringRef initMainFileName(CompilerInstance& compiler)
{
StringRef const& fn(compiler.getASTContext().getSourceManager().getFileEntryForID(
compiler.getASTContext().getSourceManager().getMainFileID())->getName());
if (fn == "<stdin>")
// stdin means icecream, so we can rely on -main-file-name containing the full path name
return compiler.getCodeGenOpts().MainFileName;
else
// this is always a full path name
return fn;
}
PluginHandler::PluginHandler( CompilerInstance& compiler, const std::vector< std::string >& args )
: compiler( compiler )
, mainFileName(compiler.getASTContext().getSourceManager().getFileEntryForID(compiler.getASTContext().getSourceManager().getMainFileID())->getName())
, mainFileName(initMainFileName(compiler))
, rewriter( compiler.getSourceManager(), compiler.getLangOpts())
, scope( "mainfile" )
, warningsAsErrors( false )