macro for static analysis tools

alalek · mshabunin · commit c5e9d1adaefd · 2017-05-23T12:35:31.000+03:00
diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp
@@ -381,6 +381,17 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch
 #define CV_Func ""
 #endif
 
+#ifdef CV_STATIC_ANALYSIS
+// In practice, some macro are not processed correctly (noreturn is not detected).
+// We need to use simplified definition for them.
+#define CV_Error(...) do { abort(); } while (0)
+#define CV_Error_(...) do { abort(); } while (0)
+#define CV_Assert(cond) do { if (!(cond)) abort(); } while (0)
+#define CV_ErrorNoReturn(...) do { abort(); } while (0)
+#define CV_ErrorNoReturn_(...) do { abort(); } while (0)
+
+#else // CV_STATIC_ANALYSIS
+
 /** @brief Call the error handler.
 
 Currently, the error handler prints the error code and the error message to the standard
@@ -421,6 +432,8 @@ configurations while CV_DbgAssert is only retained in the Debug configuration.
 /** same as CV_Error_(code,args), but does not return */
 #define CV_ErrorNoReturn_( code, args ) cv::errorNoReturn( code, cv::format args, CV_Func, __FILE__, __LINE__ )
 
+#endif // CV_STATIC_ANALYSIS
+
 /** replaced with CV_Assert(expr) in Debug configuration */
 #ifdef _DEBUG
 #  define CV_DbgAssert(expr) CV_Assert(expr)
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
@@ -302,6 +302,18 @@ Cv64suf;
 #  define MAX(a,b)  ((a) < (b) ? (b) : (a))
 #endif
 
+/****************************************************************************************\
+*                                    static analysys                                     *
+\****************************************************************************************/
+
+// In practice, some macro are not processed correctly (noreturn is not detected).
+// We need to use simplified definition for them.
+#ifndef CV_STATIC_ANALYSIS
+# if defined(__KLOCWORK__) || defined(__clang_analyzer__) || defined(__COVERITY__)
+#   define CV_STATIC_ANALYSIS
+# endif
+#endif
+
 /****************************************************************************************\
 *          exchange-add operation for atomic operations on reference counters            *
 \****************************************************************************************/
diff --git a/modules/imgproc/src/thresh.cpp b/modules/imgproc/src/thresh.cpp
@@ -463,7 +463,7 @@ thresh_16s( const Mat& _src, Mat& _dst, short thresh, short maxval, int type )
             }
             break;
         default:
-            return CV_Error( CV_StsBadArg, "" );
+            CV_Error( CV_StsBadArg, "" ); return;
         }
     }
     else
@@ -517,7 +517,7 @@ thresh_16s( const Mat& _src, Mat& _dst, short thresh, short maxval, int type )
             }
             break;
         default:
-            return CV_Error( CV_StsBadArg, "" );
+            CV_Error( CV_StsBadArg, "" ); return;
         }
     }
 }
@@ -698,7 +698,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
                 }
                 break;
             default:
-                return CV_Error( CV_StsBadArg, "" );
+                CV_Error( CV_StsBadArg, "" ); return;
         }
     }
     else
@@ -752,7 +752,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
                 }
                 break;
             default:
-                return CV_Error( CV_StsBadArg, "" );
+                CV_Error( CV_StsBadArg, "" ); return;
         }
     }
 }
@@ -893,7 +893,7 @@ thresh_64f(const Mat& _src, Mat& _dst, double thresh, double maxval, int type)
             }
             break;
         default:
-            return CV_Error(CV_StsBadArg, "");
+            CV_Error(CV_StsBadArg, ""); return;
         }
     }
     else
@@ -952,7 +952,7 @@ thresh_64f(const Mat& _src, Mat& _dst, double thresh, double maxval, int type)
             }
             break;
         default:
-            return CV_Error(CV_StsBadArg, "");
+            CV_Error(CV_StsBadArg, ""); return;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ thresh_16s( const Mat& _src, Mat& _dst, short thresh, short maxval, int type )`
`463`	`463`	`}`
`464`	`464`	`break;`
`465`	`465`	`default:`
`466`		`- return CV_Error( CV_StsBadArg, "" );`
	`466`	`+ CV_Error( CV_StsBadArg, "" ); return;`
`467`	`467`	`}`
`468`	`468`	`}`
`469`	`469`	`else`
`@@ -517,7 +517,7 @@ thresh_16s( const Mat& _src, Mat& _dst, short thresh, short maxval, int type )`
`517`	`517`	`}`
`518`	`518`	`break;`
`519`	`519`	`default:`
`520`		`- return CV_Error( CV_StsBadArg, "" );`
	`520`	`+ CV_Error( CV_StsBadArg, "" ); return;`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`	`}`
`@@ -698,7 +698,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )`
`698`	`698`	`}`
`699`	`699`	`break;`
`700`	`700`	`default:`
`701`		`- return CV_Error( CV_StsBadArg, "" );`
	`701`	`+ CV_Error( CV_StsBadArg, "" ); return;`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`	`else`
`@@ -752,7 +752,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )`
`752`	`752`	`}`
`753`	`753`	`break;`
`754`	`754`	`default:`
`755`		`- return CV_Error( CV_StsBadArg, "" );`
	`755`	`+ CV_Error( CV_StsBadArg, "" ); return;`
`756`	`756`	`}`
`757`	`757`	`}`
`758`	`758`	`}`
`@@ -893,7 +893,7 @@ thresh_64f(const Mat& _src, Mat& _dst, double thresh, double maxval, int type)`
`893`	`893`	`}`
`894`	`894`	`break;`
`895`	`895`	`default:`
`896`		`- return CV_Error(CV_StsBadArg, "");`
	`896`	`+ CV_Error(CV_StsBadArg, ""); return;`
`897`	`897`	`}`
`898`	`898`	`}`
`899`	`899`	`else`
`@@ -952,7 +952,7 @@ thresh_64f(const Mat& _src, Mat& _dst, double thresh, double maxval, int type)`
`952`	`952`	`}`
`953`	`953`	`break;`
`954`	`954`	`default:`
`955`		`- return CV_Error(CV_StsBadArg, "");`
	`955`	`+ CV_Error(CV_StsBadArg, ""); return;`
`956`	`956`	`}`
`957`	`957`	`}`
`958`	`958`	`}`