hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

C++: accept test output

Browse Source
This commit is contained in:
Robert Marsh
2018-09-04 12:26:05 -07:00
parent bbafcd9941
commit 166dba288b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpp/ql/src/semmle/code/cpp/valuenumbering/HashCons.qll
View File

@@ -748,14 +748,13 @@ private predicate mk_FieldCons(Class c, int i, Field f, HashCons hc, HC_Fields h
cal.getType().getUnspecifiedType() = c and
exists(Expr e |
e = cal.getFieldExpr(f).getFullyConverted() and
e = cal.getChild(i).getFullyConverted() and
f.getInitializationOrder() = i and
hc = hashCons(e) and
(
exists(HashCons head, Field f2, HC_Fields tail |
hcf = HC_FieldCons(c, i-1, f2, head, tail) and
cal.getChild(i-1).getFullyConverted() = cal.getFieldExpr(f2).getFullyConverted() and
f2.getInitializationOrder() = i-1 and
mk_FieldCons(c, i-1, f2, head, tail, cal)
)
or
i = 0 and
@@ -777,7 +776,7 @@ private predicate mk_ClassAggregateLiteral(Class c, HC_Fields hcf, ClassAggregat
c = cal.getType().getUnspecifiedType() and
(
exists(HC_Fields tail, Expr e, Field f |
e = cal.getChild(cal.getNumChild() - 1).getFullyConverted() and
f.getInitializationOrder() = cal.getNumChild() - 1 and
e = cal.getFieldExpr(f).getFullyConverted() and
hcf = HC_FieldCons(c, cal.getNumChild() - 1, f, hashCons(e), tail) and
mk_FieldCons(c, cal.getNumChild() - 1, f, hashCons(e), tail, cal)

1
cpp/ql/test/library-tests/valuenumbering/HashCons/HashCons.expected
View File

@@ -111,7 +111,6 @@
| test.cpp:269:3:269:19 | {...} | 269:c3-c19 270:c3-c19 |
| test.cpp:273:3:273:12 | new[] | 273:c3-c12 274:c3-c12 |
| test.cpp:273:11:273:11 | x | 273:c11-c11 274:c11-c11 |
| test.cpp:284:15:287:3 | {...} | 284:c15-c3 288:c15-c3 |
| test.cpp:299:3:299:9 | throw ... | 299:c3-c9 300:c3-c9 |
| test.cpp:301:3:301:9 | throw ... | 301:c3-c9 302:c3-c9 |
| test.cpp:303:3:303:7 | re-throw exception | 303:c3-c7 304:c3-c7 |