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

Improve loplugin:salcall error reporting

Browse Source 
Change-Id: I214052491e90eb4147bf79d6fd3927266638c686
Reviewed-on: https://gerrit.libreoffice.org/46203
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-12-10 23:18:17 +01:00
parent e1bd0dd996
commit 492afb35b4
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compilerplugins/clang/salcall.cxx
View File

@@ -191,11 +191,10 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
else if (bDeclIsSalCall) else if (bDeclIsSalCall)
{ {
// not fine // not fine
report(DiagnosticsEngine::Warning, "SAL_CALL inconsistency", report(DiagnosticsEngine::Warning, "SAL_CALL inconsistency", decl->getLocation())
canonicalDecl->getLocation())
<< canonicalDecl->getSourceRange();
report(DiagnosticsEngine::Note, "SAL_CALL inconsistency", decl->getLocation())
<< decl->getSourceRange(); << decl->getSourceRange();
report(DiagnosticsEngine::Note, "SAL_CALL inconsistency", canonicalDecl->getLocation())
<< canonicalDecl->getSourceRange();
return true; return true;
} }
} }

12
compilerplugins/clang/test/salcall.cxx
View File

@@ -31,9 +31,9 @@ void SAL_CALL Class1::method1()
class Class2 class Class2
{ {
void method1(); // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}} void method1(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
}; };
void SAL_CALL Class2::method1() {} // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}} void SAL_CALL Class2::method1() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
// comment this out because it seems to generate a warning in some internal buffer of clang that I can't annotate // comment this out because it seems to generate a warning in some internal buffer of clang that I can't annotate
#if 0 #if 0
@@ -120,12 +120,12 @@ class Class8_3 : public Class8_1, public Class8_2
#define M1(m) void m #define M1(m) void m
class Class9 class Class9
{ {
M1(method1)(); // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}} M1(method1)(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
void method2(); // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}} void method2(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
}; };
void SAL_CALL Class9::method1() {} // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}} void SAL_CALL Class9::method1() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
#define M2(T) T SAL_CALL #define M2(T) T SAL_CALL
M2(void) Class9::method2() {} // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}} M2(void) Class9::method2() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
#if 0 // see TODO in SalCall::isSalCallFunction #if 0 // see TODO in SalCall::isSalCallFunction
class Class10 class Class10