Skip to content

Commit 6370722

Browse files
lcarteylcartey
committed
Merge branch 'main' into lcartey/dead-code-improvements
2 parents 785974b + 3d43eac commit 6370722

34 files changed

Lines changed: 425 additions & 46 deletions

File tree

‎amendments.csv‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
language,standard,amendment,rule_id,queryable,implementation_category,implemented,difficulty
2+
c,misra-c-2012,Amendment3,DIR-4-6,Yes,Expand,No,Easy
3+
c,misra-c-2012,Amendment3,DIR-4-9,Yes,Refine,No,Easy
4+
c,misra-c-2012,Amendment3,DIR-4-11,Yes,Refine,No,Import
5+
c,misra-c-2012,Amendment3,RULE-1-4,Yes,Replace,No,Easy
6+
c,misra-c-2012,Amendment3,RULE-10-1,Yes,Replace,No,Easy
7+
c,misra-c-2012,Amendment3,RULE-10-3,Yes,Refine,No,Easy
8+
c,misra-c-2012,Amendment3,RULE-10-4,Yes,Refine,No,Import
9+
c,misra-c-2012,Amendment3,RULE-10-5,Yes,Expand,No,Easy
10+
c,misra-c-2012,Amendment3,RULE-10-7,Yes,Refine,No,Import
11+
c,misra-c-2012,Amendment3,RULE-10-8,Yes,Refine,No,Import
12+
c,misra-c-2012,Amendment3,RULE-21-11,Yes,Clarification,No,Import
13+
c,misra-c-2012,Amendment3,RULE-21-12,Yes,Replace,No,Easy
14+
c,misra-c-2012,Amendment4,RULE-11-3,Yes,Expand,No,Easy
15+
c,misra-c-2012,Amendment4,RULE-11-8,Yes,Expand,No,Easy
16+
c,misra-c-2012,Amendment4,RULE-13-2,Yes,Expand,No,Very Hard
17+
c,misra-c-2012,Amendment4,RULE-18-6,Yes,Expand,No,Medium
18+
c,misra-c-2012,Amendment4,RULE-18-8,Yes,Split,No,Easy
19+
c,misra-c-2012,Corrigendum2,RULE-2-2,Yes,Clarification,No,Import
20+
c,misra-c-2012,Corrigendum2,RULE-2-7,Yes,Clarification,No,Import
21+
c,misra-c-2012,Corrigendum2,RULE-3-1,Yes,Refine,No,Easy
22+
c,misra-c-2012,Corrigendum2,RULE-8-6,Yes,Clarification,No,Import
23+
c,misra-c-2012,Corrigendum2,RULE-8-9,Yes,Clarification,No,Import
24+
c,misra-c-2012,Corrigendum2,RULE-9-4,Yes,Clarification,No,Import
25+
c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
26+
c,misra-c-2012,Corrigendum2,RULE-18-3,Yes,Clarification,No,Import
27+
c,misra-c-2012,Corrigendum2,RULE-1-4,Yes,Replace,No,Easy
28+
c,misra-c-2012,Corrigendum2,RULE-9-1,Yes,Refine,No,Easy
29+
c,misra-c-2012,Corrigendum2,RULE-9-2,Yes,Refine,No,Import
30+
c,misra-c-2012,Corrigendum2,DIR-4-10,Yes,Clarification,No,Import
31+
c,misra-c-2012,Corrigendum2,RULE-7-4,Yes,Refine,No,Easy
32+
c,misra-c-2012,Corrigendum2,RULE-8-2,Yes,Clarification,No,Import
33+
c,misra-c-2012,Corrigendum2,RULE-8-3,Yes,Refine,No,Easy
34+
c,misra-c-2012,Corrigendum2,RULE-8-7,Yes,Clarification,No,Import
35+
c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
36+
c,misra-c-2012,Corrigendum2,RULE-10-2,Yes,Refine,No,Easy
37+
c,misra-c-2012,Corrigendum2,RULE-10-3,Yes,Clarification,No,Import
38+
c,misra-c-2012,Corrigendum2,RULE-11-3,Yes,Clarification,No,Import
39+
c,misra-c-2012,Corrigendum2,RULE-11-6,Yes,Clarification,No,Import
40+
c,misra-c-2012,Corrigendum2,RULE-13-2,Yes,Clarification,No,Import
41+
c,misra-c-2012,Corrigendum2,RULE-13-6,Yes,Clarification,No,Import
42+
c,misra-c-2012,Corrigendum2,RULE-14-3,Yes,Refine,No,Easy
43+
c,misra-c-2012,Corrigendum2,RULE-15-7,Yes,Clarification,No,Import
44+
c,misra-c-2012,Corrigendum2,RULE-17-4,Yes,Clarification,No,Import
45+
c,misra-c-2012,Corrigendum2,RULE-17-5,Yes,Clarification,No,Import
46+
c,misra-c-2012,Corrigendum2,RULE-18-1,Yes,Refine,No,Easy
47+
c,misra-c-2012,Corrigendum2,RULE-20-14,Yes,Clarification,No,Import
48+
c,misra-c-2012,Corrigendum2,RULE-21-19,Yes,Clarification,No,Import
49+
c,misra-c-2012,Corrigendum2,RULE-21-20,Yes,Refine,No,Easy
50+
c,misra-c-2012,Corrigendum2,RULE-22-9,Yes,Clarification,No,Import

‎c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,73 @@
1313

1414
import cpp
1515
import codingstandards.c.misra
16+
import codingstandards.cpp.Macro
1617
import codingstandards.cpp.Pointers
1718

18-
from CStyleCast cast, Type typeFrom, Type typeTo
19+
MacroInvocation getAMacroInvocation(CStyleCast cast) { result.getAnExpandedElement() = cast }
20+
21+
Macro getPrimaryMacro(CStyleCast cast) {
22+
exists(MacroInvocation mi |
23+
mi = getAMacroInvocation(cast) and
24+
not exists(MacroInvocation otherMi |
25+
otherMi = getAMacroInvocation(cast) and otherMi.getParentInvocation() = mi
26+
) and
27+
result = mi.getMacro()
28+
)
29+
}
30+
31+
Macro getNonFunctionPrimaryMacro(CStyleCast cast) {
32+
result = getPrimaryMacro(cast) and
33+
not result instanceof FunctionLikeMacro
34+
}
35+
36+
from
37+
Locatable primaryLocation, CStyleCast cast, Type typeFrom, Type typeTo, string message,
38+
string extraMessage, Locatable optionalPlaceholderLocation, string optionalPlaceholderMessage
1939
where
2040
not isExcluded(cast, Pointers1Package::conversionBetweenPointerToObjectAndIntegerTypeQuery()) and
2141
typeFrom = cast.getExpr().getUnderlyingType() and
2242
typeTo = cast.getUnderlyingType() and
23-
[typeFrom, typeTo] instanceof IntegralType and
24-
[typeFrom, typeTo] instanceof PointerToObjectType and
25-
not isNullPointerConstant(cast.getExpr())
26-
select cast, "Cast performed between a pointer to object type and a pointer to an integer type."
43+
(
44+
typeFrom instanceof PointerToObjectType and
45+
typeTo instanceof IntegralType and
46+
message =
47+
"Cast from pointer to object type '" + typeFrom + "' to integer type '" + typeTo + "'" +
48+
extraMessage + "."
49+
or
50+
typeFrom instanceof IntegralType and
51+
typeTo instanceof PointerToObjectType and
52+
message =
53+
"Cast from integer type '" + typeFrom + "' to pointer to object type '" + typeTo + "'" +
54+
extraMessage + "."
55+
) and
56+
not isNullPointerConstant(cast.getExpr()) and
57+
// If this alert is arising through a non-function-like macro expansion, flag the macro instead, to
58+
// help make the alerts more manageable. We only do this for non-function-like macros because they
59+
// cannot be context specific.
60+
if exists(getNonFunctionPrimaryMacro(cast))
61+
then
62+
primaryLocation = getNonFunctionPrimaryMacro(cast) and
63+
extraMessage = "" and
64+
optionalPlaceholderLocation = primaryLocation and
65+
optionalPlaceholderMessage = ""
66+
else (
67+
primaryLocation = cast and
68+
// If the cast is in a macro expansion which is context specific, we still report the original
69+
// location, but also add a link to the most specific macro that contains the cast, to aid
70+
// validation.
71+
if exists(getPrimaryMacro(cast))
72+
then
73+
extraMessage = " from expansion of macro $@" and
74+
exists(Macro m |
75+
m = getPrimaryMacro(cast) and
76+
optionalPlaceholderLocation = m and
77+
optionalPlaceholderMessage = m.getName()
78+
)
79+
else (
80+
extraMessage = "" and
81+
optionalPlaceholderLocation = cast and
82+
optionalPlaceholderMessage = ""
83+
)
84+
)
85+
select primaryLocation, message, optionalPlaceholderLocation, optionalPlaceholderMessage

‎c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ where
2222
typeTo = cast.getUnderlyingType() and
2323
[typeFrom, typeTo] instanceof ArithmeticType and
2424
[typeFrom, typeTo] instanceof VoidPointerType and
25-
not isNullPointerConstant(cast.getExpr())
25+
not cast.getExpr() instanceof Zero
2626
select cast, "Cast performed between a pointer to void type and an arithmetic type."

‎c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,25 @@ import codingstandards.cpp.Type
1818
from Zero zero, Expr e, string type
1919
where
2020
not isExcluded(zero, Pointers1Package::macroNullNotUsedAsIntegerNullPointerConstantQuery()) and
21-
// exclude the base-case (NULL macros and void pointer casts)
22-
not isNullPointerConstant(zero) and
21+
// Exclude the base-case (NULL macros and void pointer casts)
22+
// Note: we cannot use the isNullPointerConstant predicate here because it permits
23+
// the use of `0` without casting, which is prohibited here.
24+
not (
25+
zero.findRootCause() instanceof NullMacro
26+
or
27+
// integer constant `0` explicitly cast to void pointer
28+
exists(Conversion c | c = zero.getConversion() |
29+
not c.isImplicit() and
30+
c.getUnderlyingType() instanceof VoidPointerType
31+
)
32+
) and
2333
(
2434
// ?: operator
2535
exists(ConditionalExpr parent |
2636
(
27-
parent.getThen().getAChild*() = zero and parent.getElse().getType() instanceof PointerType
37+
parent.getThen() = zero and parent.getElse().getType() instanceof PointerType
2838
or
29-
parent.getElse().getAChild*() = zero and parent.getThen().getType() instanceof PointerType
39+
parent.getElse() = zero and parent.getThen().getType() instanceof PointerType
3040
) and
3141
// exclude a common conditional pattern used in macros such as 'assert'
3242
not parent.isInMacroExpansion() and

‎c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* @id c/misra/bit-field-declared-as-member-of-a-union
3+
* @name RULE-6-3: A bit field shall not be declared as a member of a union
4+
* @description Type punning on a union with bit fields relies on implementation-specific alignment
5+
* behavior.
6+
* @kind problem
7+
* @precision very-high
8+
* @problem.severity warning
9+
* @tags external/misra/id/rule-6-3
10+
* correctness
11+
* external/misra/obligation/required
12+
*/
13+
14+
import cpp
15+
import codingstandards.c.misra
16+
17+
from BitField field, Union u
18+
where
19+
not isExcluded(field, BitfieldTypes2Package::bitFieldDeclaredAsMemberOfAUnionQuery()) and
20+
u.getAField() = field
21+
select field,
22+
"Union member " + field.getName() +
23+
" is declared as a bit field which relies on implementation-specific behavior."

‎c/misra/test/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
| test.c:11:8:11:16 | (fp1 *)... | Cast performed between a function pointer and another type. |
22
| test.c:11:8:11:16 | (fp1)... | Cast performed between a function pointer and another type. |
33
| test.c:12:14:12:23 | (void *)... | Cast performed between a function pointer and another type. |
4-
| test.c:14:8:14:15 | (fp2)... | Cast performed between a function pointer and another type. |
54
| test.c:15:8:15:15 | (fp2)... | Cast performed between a function pointer and another type. |
65
| test.c:22:12:22:13 | (fp1)... | Cast performed between a function pointer and another type. |
76
| test.c:25:8:25:9 | (fp1)... | Cast performed between a function pointer and another type. |

‎c/misra/test/rules/RULE-11-1/test.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void f1(void) {
1111
v1 = (fp1 *)v2; // NON_COMPLIANT
1212
void *v3 = (void *)v1; // NON_COMPLIANT
1313

14-
v2 = (fp2 *)0; // NON_COMPLIANT
14+
v2 = (fp2 *)0; // COMPLIANT - null pointer constant
1515
v2 = (fp2 *)1; // NON_COMPLIANT
1616

1717
pfp2 v4;

‎c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| test.c:5:21:5:42 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
2-
| test.c:5:35:5:42 | (int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
3-
| test.c:6:21:6:37 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
4-
| test.c:8:8:8:24 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
5-
| test.c:10:22:10:22 | (unsigned int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
6-
| test.c:12:22:12:39 | (unsigned int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
1+
| test.c:6:21:6:37 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:6:21:6:37 | (unsigned int)... | |
2+
| test.c:8:8:8:24 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:8:8:8:24 | (unsigned int)... | |
3+
| test.c:12:22:12:39 | (unsigned int *)... | Cast from integer type 'unsigned int' to pointer to object type 'unsigned int *'. | test.c:12:22:12:39 | (unsigned int *)... | |
4+
| test.c:15:1:15:24 | #define FOO (int *)0x200 | Cast from integer type 'int' to pointer to object type 'int *'. | test.c:15:1:15:24 | #define FOO (int *)0x200 | |
5+
| test.c:23:3:23:22 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:17:1:17:34 | #define FOO_FUNCTIONAL(x) (int *)x | FOO_FUNCTIONAL |
6+
| test.c:24:14:24:25 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:18:1:18:23 | #define FOO_INSERT(x) x | FOO_INSERT |

‎c/misra/test/rules/RULE-11-4/test.c‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,24 @@
22

33
void f1(void) {
44
unsigned int v1 = (unsigned int)(void *)0; // COMPLIANT
5-
unsigned int v2 = (unsigned int)(int *)0; // NON_COMPLIANT
5+
unsigned int v2 = (unsigned int)(int *)0; // COMPLIANT
66
unsigned int v3 = (unsigned int)&v2; // NON_COMPLIANT
77
v3 = v2; // COMPLIANT
88
v3 = (unsigned int)&v2; // NON_COMPLIANT
99
v3 = NULL; // COMPLIANT
10-
unsigned int *v4 = 0; // NON_COMPLIANT
10+
unsigned int *v4 = 0; // COMPLIANT
1111
unsigned int *v5 = NULL; // COMPLIANT
1212
unsigned int *v6 = (unsigned int *)v2; // NON_COMPLIANT
13+
}
14+
15+
#define FOO (int *)0x200 // NON_COMPLIANT
16+
#define FOO_WRAPPER FOO;
17+
#define FOO_FUNCTIONAL(x) (int *)x
18+
#define FOO_INSERT(x) x
19+
20+
void test_macros() {
21+
FOO; // Issue is reported at the macro
22+
FOO_WRAPPER; // Issue is reported at the macro
23+
FOO_FUNCTIONAL(0x200); // NON_COMPLIANT
24+
FOO_INSERT((int *)0x200); // NON_COMPLIANT
1325
}

‎c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| test.c:15:13:15:13 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:15:7:15:13 | ... == ... | Equality operator |
22
| test.c:17:8:17:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:17:3:17:8 | ... = ... | Assignment to pointer |
3-
| test.c:25:20:25:20 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:25:3:25:35 | ... ? ... : ... | Ternary operator |
4-
| test.c:25:20:25:20 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:25:15:25:20 | ... = ... | Assignment to pointer |
3+
| test.c:23:13:23:13 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:23:3:23:13 | ... ? ... : ... | Ternary operator |
4+
| test.c:24:8:24:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:24:3:24:13 | ... ? ... : ... | Ternary operator |
5+
| test.c:31:14:31:14 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:31:9:31:14 | ... = ... | Assignment to pointer |

0 commit comments

Comments
 (0)