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

only one warning per one SAL_INFO/SAL_WARN

Browse Source 
Change-Id: I5aafe9ed51c86dc31492d205f44fba6b1db137d2
This commit is contained in:
Lubos Lunak
2012-10-17 19:53:32 +02:00
parent 06b8cdc503
commit 1a77b93aec
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compilerplugins/clang/sallogareas.cxx
View File

@@ -31,6 +31,7 @@ SalLogAreas::SalLogAreas( ASTContext& context )
void SalLogAreas::run() void SalLogAreas::run()
{ {
inFunction = NULL; inFunction = NULL;
lastSalDetailLogStreamMacro = SourceLocation();
TraverseDecl( context.getTranslationUnitDecl()); TraverseDecl( context.getTranslationUnitDecl());
} }
@@ -55,6 +56,13 @@ bool SalLogAreas::VisitCallExpr( CallExpr* call )
{ {
if( const StringLiteral* area = dyn_cast< StringLiteral >( call->getArg( 1 )->IgnoreParenImpCasts())) if( const StringLiteral* area = dyn_cast< StringLiteral >( call->getArg( 1 )->IgnoreParenImpCasts()))
{ {
// The SAL_DETAIL_LOG_STREAM macro expands to two calls to sal::detail::log(),
// so do not warn repeatedly about the same macro (the area->getLocStart() of all the calls
// from the same macro should be the same).
SourceLocation expansionLocation = context.getSourceManager().getExpansionLoc(area->getLocStart());
if( expansionLocation == lastSalDetailLogStreamMacro )
return true;
lastSalDetailLogStreamMacro = expansionLocation;
if( area->getKind() == StringLiteral::Ascii ) if( area->getKind() == StringLiteral::Ascii )
checkArea( area->getBytes(), area->getExprLoc()); checkArea( area->getBytes(), area->getExprLoc());
else else

1
compilerplugins/clang/sallogareas.hxx
View File

@@ -31,6 +31,7 @@ class SalLogAreas
void checkArea( StringRef area, SourceLocation location ); void checkArea( StringRef area, SourceLocation location );
void readLogAreas(); void readLogAreas();
const FunctionDecl* inFunction; const FunctionDecl* inFunction;
SourceLocation lastSalDetailLogStreamMacro;
set< string > logAreas; set< string > logAreas;
}; };