Fix 206: false positive: misra-c2012-2.5

swasti16 · swasti16 · commit d4e1dd44bb2e · 2024-12-08T21:06:39.000+05:30
diff --git a/addons/misra.py b/addons/misra.py
@@ -1588,16 +1588,23 @@ def misra_2_4(self, dumpfile, cfg):
 
     def misra_2_5(self, dumpfile, cfg):
         used_macros = []
+        unused_macro = {}
         for m in cfg.macro_usage:
             used_macros.append(m.name)
-        summary = []
         for directive in cfg.directives:
-            res = re.match(r'#define[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
-            if res:
-                macro_name = res.group(1)
-                summary.append({'name': macro_name, 'used': (macro_name in used_macros), 'file': directive.file, 'line': directive.linenr, 'column': directive.column})
-        if len(summary) > 0:
-            cppcheckdata.reportSummary(dumpfile, 'MisraMacro', summary)
+            res_define = re.match(r'#define[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
+            res_undef = re.match(r'#undef[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
+            if res_define:
+                macro_name = res_define.group(1)
+                unused_macro[macro_name+'_define'] = {'name': macro_name+'_define', 'used': (macro_name in used_macros),
+                                            'file': directive.file,'line': directive.linenr, 'column': directive.column}
+            elif res_undef:
+                macro_name = res_undef.group(1)
+                unused_macro[macro_name+'_undef'] = {'name': macro_name + '_undef', 'used': (macro_name in used_macros),
+                                            'file': directive.file,
+                                            'line': directive.linenr, 'column': directive.column}
+        if unused_macro:
+            cppcheckdata.reportSummary(dumpfile, 'MisraMacro', list(unused_macro.values()))
 
     def misra_2_7(self, data):
         for func in data.functions:
@@ -4801,10 +4808,15 @@ def is_different_file(loc1, loc2):
         unused_tags = [tag for tag in all_tagname_info.values() if not tag['used']]
         for tag in unused_tags:
             self.reportError(Location(tag), 2, 4)
-
-        unused_macros = [m for m in all_macro_info.values() if not m['used']]
-        for m in unused_macros:
-            self.reportError(Location(m), 2, 5)
+        for m_key,m_value in all_macro_info.items():
+            i = m_key.rfind('_')
+            m_key_name,m_directive = m_key[:i], m_key[i+1: ]
+            if m_directive == 'undef' and m_key_name + '_define' in all_macro_info:
+                continue
+            if m_directive == 'define' and m_key_name + '_undef' in all_macro_info:
+                continue
+            if not m_value['used']:
+                self.reportError(Location(m_value), 2, 5)
 
         all_external_identifiers = all_external_identifiers_decl
         all_external_identifiers.update(all_external_identifiers_def)
diff --git a/addons/test/misra/misra-ctu-1-test.c b/addons/test/misra/misra-ctu-1-test.c
@@ -7,6 +7,9 @@ extern MISRA_2_3_A  misra_2_3_a;
 
 x = MISRA_2_5_OK_1;
 
+// cppcheck-suppress misra-c2012-20.5
+#undef MISRA_2_5_OK_3
+
 // cppcheck-suppress misra-c2012-2.3
 // cppcheck-suppress misra-c2012-5.6
 typedef int MISRA_5_6_VIOLATION;
diff --git a/addons/test/misra/misra-ctu-test.h b/addons/test/misra/misra-ctu-test.h
@@ -21,3 +21,4 @@ void misra_8_7_external(void);
 // #12362
 extern void misra_8_7_compliant( void );
 
+#define MISRA_2_5_OK_3 This

Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,4 @@ void misra_8_7_external(void);`
`21`	`21`	`// #12362`
`22`	`22`	`extern void misra_8_7_compliant( void );`
`23`	`23`
	`24`	`+#define MISRA_2_5_OK_3 This`