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

Revert "ignore already seen locations in compiler plugins"

Browse Source 
This does not always work well, e.g. when building a return value
in a return statement from a temporary, there is CXXConstructExpr
containing CXXTemporaryObjectExpr, which both share the same location.
This reverts commit 1c0669af2f1f58e6431b5e489ac48a883e242ba7.
This commit is contained in:
Luboš Luňák
2013-05-06 15:14:35 +02:00
parent a0da672521
commit d01768c31a
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
compilerplugins/clang/plugin.cxx
View File

@@ -56,21 +56,12 @@ bool Plugin::ignoreLocation( SourceLocation loc )
const char* bufferName = compiler.getSourceManager().getPresumedLoc( expansionLoc ).getFilename();
if( bufferName == NULL )
return true;
if( strncmp( bufferName, OUTDIR, strlen( OUTDIR )) != 0
&& strncmp( bufferName, WORKDIR, strlen( WORKDIR )) != 0
&& strncmp( bufferName, BUILDDIR, strlen( BUILDDIR )) != 0
&& strncmp( bufferName, SRCDIR, strlen( SRCDIR )) != 0 )
return true; // not in LO sources
// Sometimes a VisitXXX function may be called more than once for one source location.
// This can happen e.g. with a default argument for a function, if it involves constructing
// a temporary, then this temporary will be constructed whenever the function is called
// and the default argument is needed. As this would mean processing the same piece of code
// more than once, and thus possibly modifying the source code more than once, just
// ignore an already seen location.
if( alreadySeen.find( loc ) != alreadySeen.end())
return true;
alreadySeen.insert( loc );
return false;
if( strncmp( bufferName, OUTDIR, strlen( OUTDIR )) == 0
|| strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0
|| strncmp( bufferName, BUILDDIR, strlen( BUILDDIR )) == 0
|| strncmp( bufferName, SRCDIR, strlen( SRCDIR )) == 0 )
return false; // ok
return true;
}
void Plugin::registerPlugin( Plugin* (*create)( CompilerInstance&, Rewriter& ), const char* optionName, bool isRewriter )