Skip to content

Commit 2b571cf

Browse files
jketemajketema
committed
C++: Address review comments
1 parent 026969b commit 2b571cf

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎cpp/ql/lib/semmle/code/cpp/exprs/Cast.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ class AlignofTypeOperator extends AlignofOperator {
795795
* A C++ `__datasizeof` expression (used by some implementations
796796
* of the `<type_traits>` header).
797797
*
798-
* The `__datasizeof` expression behaves identical to `sizeof` except
798+
* The `__datasizeof` expression behaves identically to `sizeof` except
799799
* that the result ignores tail padding.
800800
*/
801801
class DatasizeofOperator extends Expr, @datasizeof {
@@ -813,7 +813,7 @@ class DatasizeofExprOperator extends DatasizeofOperator {
813813
/** Gets the contained expression. */
814814
Expr getExprOperand() { result = this.getChild(0) }
815815

816-
override string toString() { result = "sizeof(<expr>)" }
816+
override string toString() { result = "__datasizeof(<expr>)" }
817817

818818
override predicate mayBeImpure() { this.getExprOperand().mayBeImpure() }
819819

@@ -831,7 +831,7 @@ class DatasizeofTypeOperator extends DatasizeofOperator {
831831
/** Gets the contained type. */
832832
Type getTypeOperand() { sizeof_bind(underlyingElement(this), unresolveElement(result)) }
833833

834-
override string toString() { result = "sizeof(" + this.getTypeOperand().getName() + ")" }
834+
override string toString() { result = "__datasizeof(" + this.getTypeOperand().getName() + ")" }
835835

836836
override predicate mayBeImpure() { none() }
837837

‎cpp/ql/test/library-tests/types/datasizeof/datasizeof.expected

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
| datasizeof.cpp:20:15:20:31 | sizeof(int) | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int |
2-
| datasizeof.cpp:21:15:21:32 | sizeof(char) | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | char |
3-
| datasizeof.cpp:22:15:22:33 | sizeof(int *) | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int * |
4-
| datasizeof.cpp:23:15:23:35 | sizeof(MyClass) | DatasizeofTypeOperator.getTypeOperand() | datasizeof.cpp:5:7:5:13 | MyClass |
5-
| datasizeof.cpp:24:15:24:29 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:24:28:24:28 | i |
6-
| datasizeof.cpp:25:15:25:29 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:25:28:25:28 | c |
7-
| datasizeof.cpp:26:15:26:31 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:26:28:26:30 | ptr |
8-
| datasizeof.cpp:27:15:27:30 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:27:28:27:29 | mc |
9-
| datasizeof.cpp:28:15:28:31 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:28:28:28:30 | arr |
10-
| datasizeof.cpp:29:16:29:35 | sizeof(<expr>) | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:29:29:29:34 | access to array |
1+
| datasizeof.cpp:20:15:20:31 | __datasizeof(int) | 4 | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int |
2+
| datasizeof.cpp:21:15:21:32 | __datasizeof(char) | 1 | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | char |
3+
| datasizeof.cpp:22:15:22:33 | __datasizeof(int *) | 8 | DatasizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int * |
4+
| datasizeof.cpp:23:15:23:35 | __datasizeof(MyClass) | 24 | DatasizeofTypeOperator.getTypeOperand() | datasizeof.cpp:5:7:5:13 | MyClass |
5+
| datasizeof.cpp:24:15:24:29 | __datasizeof(<expr>) | 4 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:24:28:24:28 | i |
6+
| datasizeof.cpp:25:15:25:29 | __datasizeof(<expr>) | 1 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:25:28:25:28 | c |
7+
| datasizeof.cpp:26:15:26:31 | __datasizeof(<expr>) | 8 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:26:28:26:30 | ptr |
8+
| datasizeof.cpp:27:15:27:30 | __datasizeof(<expr>) | 24 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:27:28:27:29 | mc |
9+
| datasizeof.cpp:28:15:28:31 | __datasizeof(<expr>) | 40 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:28:28:28:30 | arr |
10+
| datasizeof.cpp:29:16:29:35 | __datasizeof(<expr>) | 4 | DatasizeofExprOperator.getExprOperand() | datasizeof.cpp:29:29:29:34 | access to array |

‎cpp/ql/test/library-tests/types/datasizeof/datasizeof.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ where
77
or
88
elemDesc = "DatasizeofExprOperator.getExprOperand()" and
99
e = sto.(DatasizeofExprOperator).getExprOperand()
10-
select sto, elemDesc, e
10+
select sto, sto.getValue(), elemDesc, e

‎cpp/ql/test/library-tests/types/sizeof/sizeof.expected

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
| sizeof.cpp:19:15:19:25 | sizeof(int) | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int |
2-
| sizeof.cpp:20:15:20:26 | sizeof(char) | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | char |
3-
| sizeof.cpp:21:15:21:27 | sizeof(int *) | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int * |
4-
| sizeof.cpp:22:15:22:29 | sizeof(MyClass) | SizeofTypeOperator.getTypeOperand() | sizeof.cpp:4:7:4:13 | MyClass |
5-
| sizeof.cpp:23:15:23:23 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:23:22:23:22 | i |
6-
| sizeof.cpp:24:15:24:23 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:24:22:24:22 | c |
7-
| sizeof.cpp:25:15:25:25 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:25:22:25:24 | ptr |
8-
| sizeof.cpp:26:15:26:24 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:26:22:26:23 | mc |
9-
| sizeof.cpp:27:15:27:25 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:27:22:27:24 | arr |
10-
| sizeof.cpp:28:16:28:29 | sizeof(<expr>) | SizeofExprOperator.getExprOperand() | sizeof.cpp:28:23:28:28 | access to array |
1+
| sizeof.cpp:19:15:19:25 | sizeof(int) | 4 | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int |
2+
| sizeof.cpp:20:15:20:26 | sizeof(char) | 1 | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | char |
3+
| sizeof.cpp:21:15:21:27 | sizeof(int *) | 8 | SizeofTypeOperator.getTypeOperand() | file://:0:0:0:0 | int * |
4+
| sizeof.cpp:22:15:22:29 | sizeof(MyClass) | 16 | SizeofTypeOperator.getTypeOperand() | sizeof.cpp:4:7:4:13 | MyClass |
5+
| sizeof.cpp:23:15:23:23 | sizeof(<expr>) | 4 | SizeofExprOperator.getExprOperand() | sizeof.cpp:23:22:23:22 | i |
6+
| sizeof.cpp:24:15:24:23 | sizeof(<expr>) | 1 | SizeofExprOperator.getExprOperand() | sizeof.cpp:24:22:24:22 | c |
7+
| sizeof.cpp:25:15:25:25 | sizeof(<expr>) | 8 | SizeofExprOperator.getExprOperand() | sizeof.cpp:25:22:25:24 | ptr |
8+
| sizeof.cpp:26:15:26:24 | sizeof(<expr>) | 16 | SizeofExprOperator.getExprOperand() | sizeof.cpp:26:22:26:23 | mc |
9+
| sizeof.cpp:27:15:27:25 | sizeof(<expr>) | 40 | SizeofExprOperator.getExprOperand() | sizeof.cpp:27:22:27:24 | arr |
10+
| sizeof.cpp:28:16:28:29 | sizeof(<expr>) | 4 | SizeofExprOperator.getExprOperand() | sizeof.cpp:28:23:28:28 | access to array |

‎cpp/ql/test/library-tests/types/sizeof/sizeof.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ where
77
or
88
elemDesc = "SizeofExprOperator.getExprOperand()" and
99
e = sto.(SizeofExprOperator).getExprOperand()
10-
select sto, elemDesc, e
10+
select sto, sto.getValue(), elemDesc, e

0 commit comments

Comments
 (0)