Avoid FP exceptThrowInNoThrowFunction and exceptThrowInNoexecptFunction

amai2012 · amai2012 · commit 559a2bc2c842 · 2014-04-10T21:55:49.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -192,7 +192,7 @@ void CheckExceptionSafety::noexceptThrows()
         if (scope->function && scope->function->isNoExcept &&
             (!scope->function->noexceptArg || scope->function->noexceptArg->str() == "true")) {
             for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
-                if (tok->str() != "throw") {
+                if (tok->str() == "throw") {
                     noexceptThrowError(tok);
                 }
             }
@@ -213,7 +213,7 @@ void CheckExceptionSafety::nothrowThrows()
         // onlycheck throw() functions
         if (scope->function && scope->function->isThrow && !scope->function->throwArg) {
             for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
-                if (tok->str() != "throw") {
+                if (tok->str() == "throw") {
                     nothrowThrowError(tok);
                 }
             }
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -317,12 +317,20 @@ class TestExceptionSafety : public TestFixture {
               "void func3() noexcept(false) { throw 1; }\n");
         ASSERT_EQUALS("[test.cpp:1]: (error) Exception thrown in noexcept function.\n"
                       "[test.cpp:2]: (error) Exception thrown in noexcept function.\n", errout.str());
+
+        // avoid false positives
+        check("const char *func() noexcept { return 0; }\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void nothrowThrow() {
         check("void func1() throw() { throw 1; }\n"
               "void func2() throw(int) { throw 1; }\n");
         ASSERT_EQUALS("[test.cpp:1]: (error) Exception thrown in throw() function.\n", errout.str());
+
+        // avoid false positives
+        check("const char *func() throw() { return 0; }\n");
+        ASSERT_EQUALS("", errout.str());
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ void CheckExceptionSafety::noexceptThrows()`
`192`	`192`	`if (scope->function && scope->function->isNoExcept &&`
`193`	`193`	`(!scope->function->noexceptArg \|\| scope->function->noexceptArg->str() == "true")) {`
`194`	`194`	`for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {`
`195`		`- if (tok->str() != "throw") {`
	`195`	`+ if (tok->str() == "throw") {`
`196`	`196`	`noexceptThrowError(tok);`
`197`	`197`	`}`
`198`	`198`	`}`
`@@ -213,7 +213,7 @@ void CheckExceptionSafety::nothrowThrows()`
`213`	`213`	`// onlycheck throw() functions`
`214`	`214`	`if (scope->function && scope->function->isThrow && !scope->function->throwArg) {`
`215`	`215`	`for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {`
`216`		`- if (tok->str() != "throw") {`
	`216`	`+ if (tok->str() == "throw") {`
`217`	`217`	`nothrowThrowError(tok);`
`218`	`218`	`}`
`219`	`219`	`}`