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

Fixed #8582 (Regression MISRA Rule 5.1)

This commit is contained in:
Daniel Marjamäki 2019-05-26 18:46:00 +02:00
parent b3c3ecf926
commit d039c388ec
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/cppcheckdata.py
View File

@ -373,6 +373,7 @@ class Variable:
isArray Is this variable an array?
isClass Is this variable a class or struct?
isConst Is this variable a const variable?
isGlobal Is this variable a global variable?
isExtern Is this variable an extern variable?
isLocal Is this variable a local variable?
isPointer Is this variable a pointer
@ -396,6 +397,7 @@ class Variable:
isClass = False
isConst = False
isExtern = False
isGlobal = False
isLocal = False
isPointer = False
isReference = False
@ -417,6 +419,7 @@ class Variable:
self.isArray = element.get('isArray') == 'true'
self.isClass = element.get('isClass') == 'true'
self.isConst = element.get('isConst') == 'true'
self.isGlobal = element.get('access') == 'Global'
self.isExtern = element.get('isExtern') == 'true'
self.isLocal = element.get('isLocal') == 'true'
self.isPointer = element.get('isPointer') == 'true'

44
addons/misra.py
View File

@ -209,6 +209,10 @@ def isFunctionCall(expr):
return True
def hasExternalLinkage(var):
return var.isGlobal and not var.isStatic
def countSideEffects(expr):
if not expr or expr.str in {',', ';'}:
return 0
@ -665,33 +669,31 @@ class MisraChecker:
def misra_5_1(self, data):
scopeVars = {}
varnames = []
for var in data.variables:
if var.isArgument:
if var.nameToken is None:
continue
if var.nameToken.scope not in scopeVars:
scopeVars[var.nameToken.scope] = []
scopeVars[var.nameToken.scope].append(var)
for scope in scopeVars:
for i, variable1 in enumerate(scopeVars[scope]):
for variable2 in scopeVars[scope][i + 1:]:
if (variable1.isExtern and variable2.isExtern and
variable1.nameToken.str[:31] == variable2.nameToken.str[:31] and
variable1.Id != variable2.Id):
if int(variable1.nameToken.linenr) > int(variable2.nameToken.linenr):
self.reportError(variable1.nameToken, 5, 1)
else:
self.reportError(variable2.nameToken, 5, 1)
if len(var.nameToken.str) <= 31:
continue
if not hasExternalLinkage(var):
continue
if var.nameToken.str[:31] in varnames:
self.reportError(var.nameToken, 5, 1)
else:
varnames.append(var.nameToken.str[:31])
def misra_5_2(self, data):
scopeVars = {}
for var in data.variables:
if var.nameToken is not None:
if var.nameToken.scope not in scopeVars:
scopeVars.setdefault(var.nameToken.scope, {})["varlist"] = []
scopeVars.setdefault(var.nameToken.scope, {})["scopelist"] = []
scopeVars[var.nameToken.scope]["varlist"].append(var)
if var.nameToken is None:
continue
if len(var.nameToken.str) <= 31:
continue
if var.nameToken.scope not in scopeVars:
scopeVars.setdefault(var.nameToken.scope, {})["varlist"] = []
scopeVars.setdefault(var.nameToken.scope, {})["scopelist"] = []
scopeVars[var.nameToken.scope]["varlist"].append(var)
for scope in data.scopes:
if scope.nestedIn and scope.className:
if scope.nestedIn not in scopeVars:
@ -705,7 +707,7 @@ class MisraChecker:
for variable2 in scopeVars[scope]["varlist"][i + 1:]:
if variable1.isArgument and variable2.isArgument:
continue
if variable1.isExtern or variable2.isExtern:
if hasExternalLinkage(variable1) or hasExternalLinkage(variable2):
continue
if (variable1.nameToken.str[:31] == variable2.nameToken.str[:31] and
variable1.Id != variable2.Id):

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

@ -24,6 +24,8 @@ typedef unsigned long long u64;
extern int misra_5_1_extern_var_hides_var_x;
extern int misra_5_1_extern_var_hides_var_y; //5.1
int misra_5_1_var_hides_var________a;
int misra_5_1_var_hides_var________b; //5.1
extern const uint8_t misra_5_2_var1;
const uint8_t misra_5_2_var1 = 3; // no warning