walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

misra; implement rule 8.6

This commit is contained in:
Daniel Marjamäki 2021-07-17 21:24:53 +02:00
parent aa910d3c38
commit 77d8b714ea
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addons/misra.py
View File

@ -1240,7 +1240,9 @@ class MisraChecker:
internal_identifiers.append(identifier(var.nameToken)) internal_identifiers.append(identifier(var.nameToken))
else: else:
names.append(var.nameToken.str) names.append(var.nameToken.str)
external_identifiers.append(identifier(var.nameToken)) i = identifier(var.nameToken)
i['decl'] = var.isExtern
external_identifiers.append(i)
for func in cfg.functions: for func in cfg.functions:
if func.tokenDef is None: if func.tokenDef is None:
@ -1248,7 +1250,9 @@ class MisraChecker:
if func.isStatic: if func.isStatic:
internal_identifiers.append(identifier(func.tokenDef)) internal_identifiers.append(identifier(func.tokenDef))
else: else:
external_identifiers.append(identifier(func.tokenDef)) i = identifier(func.tokenDef)
i['decl'] = func.token is None
external_identifiers.append(i)
cppcheckdata.reportSummary(dumpfile, 'MisraExternalIdentifiers', external_identifiers) cppcheckdata.reportSummary(dumpfile, 'MisraExternalIdentifiers', external_identifiers)
cppcheckdata.reportSummary(dumpfile, 'MisraInternalIdentifiers', internal_identifiers) cppcheckdata.reportSummary(dumpfile, 'MisraInternalIdentifiers', internal_identifiers)
@ -3605,7 +3609,8 @@ class MisraChecker:
all_typedef_info = [] all_typedef_info = []
all_tagname_info = [] all_tagname_info = []
all_macro_info = [] all_macro_info = []
all_external_identifiers = {} all_external_identifiers_decl = {}
all_external_identifiers_def = {}
all_internal_identifiers = {} all_internal_identifiers = {}
all_local_identifiers = {} all_local_identifiers = {}
@ -3669,10 +3674,18 @@ class MisraChecker:
if summary_type == 'MisraExternalIdentifiers': if summary_type == 'MisraExternalIdentifiers':
for s in summary_data: for s in summary_data:
if s['name'] in all_external_identifiers and is_different_location(s, all_external_identifiers[s['name']]): is_declaration = s['decl']
self.reportError(Location(s), 8, 5) if is_declaration:
self.reportError(Location(all_external_identifiers[s['name']]), 8, 5) all_external_identifiers = all_external_identifiers_decl
all_external_identifiers[s['name']] = s else:
all_external_identifiers = all_external_identifiers_def
name = s['name']
if name in all_external_identifiers and is_different_location(s, all_external_identifiers[name]):
num = 5 if is_declaration else 6
self.reportError(Location(s), 8, num)
self.reportError(Location(all_external_identifiers[name]), 8, num)
all_external_identifiers[name] = s
if summary_type == 'MisraInternalIdentifiers': if summary_type == 'MisraInternalIdentifiers':
for s in summary_data: for s in summary_data:
@ -3697,6 +3710,8 @@ class MisraChecker:
if not m['used']: if not m['used']:
self.reportError(Location(m), 2, 5) self.reportError(Location(m), 2, 5)
all_external_identifiers = all_external_identifiers_decl
all_external_identifiers.update(all_external_identifiers_def)
for name, external_identifier in all_external_identifiers.items(): for name, external_identifier in all_external_identifiers.items():
internal_identifier = all_internal_identifiers.get(name) internal_identifier = all_internal_identifiers.get(name)
if internal_identifier: if internal_identifier:

4
addons/test/misra/misra-ctu-1-test.c
View File

@ -33,3 +33,7 @@ static void misra_5_8_foo(void) {}
// cppcheck-suppress misra-c2012-8.4 // cppcheck-suppress misra-c2012-8.4
// cppcheck-suppress misra-c2012-8.5 // cppcheck-suppress misra-c2012-8.5
extern int misra_8_5; extern int misra_8_5;
// cppcheck-suppress misra-c2012-8.6
int32_t misra_8_6 = 1;

4
addons/test/misra/misra-ctu-2-test.c
View File

@ -34,3 +34,7 @@ static void misra_5_8_foo(void) {}
// cppcheck-suppress misra-c2012-8.4 // cppcheck-suppress misra-c2012-8.4
// cppcheck-suppress misra-c2012-8.5 // cppcheck-suppress misra-c2012-8.5
extern int misra_8_5; extern int misra_8_5;
// cppcheck-suppress misra-c2012-8.6
int32_t misra_8_6 = 2;