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

Merge pull request #1951 from pavgust/fix/hashcons-perf

Browse Source 
C++: Fix HashCons library performance
This commit is contained in:
Jonas Jensen
2019-09-19 08:10:34 +02:00
committed by GitHub
parent 327ade1f34 eca31908ab
commit 9b805c01cc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,14 +737,15 @@ private predicate mk_FieldCons(
exists(Expr e |
e = cal.getFieldExpr(f).getFullyConverted() and
f.getInitializationOrder() = i and
hc = hashCons(e) and
(
exists(HashCons head, Field f2, HC_Fields tail |
hc = hashCons(e) and
hcf = HC_FieldCons(c, i - 1, f2, head, tail) and
f2.getInitializationOrder() = i - 1 and
mk_FieldCons(c, i - 1, f2, head, tail, cal)
)
or
hc = hashCons(e) and
i = 0 and
hcf = HC_EmptyFields(c)
)
@@ -765,11 +766,13 @@ private predicate mk_ClassAggregateLiteral(Class c, HC_Fields hcf, ClassAggregat
analyzableClassAggregateLiteral(cal) and
c = cal.getUnspecifiedType() and
(
exists(HC_Fields tail, Expr e, Field f |
exists(HC_Fields tail, Expr e, Field f, int numChildren, HashCons eCons |
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)
eCons = hashCons(e) and
numChildren = cal.getNumChild() and
hcf = HC_FieldCons(c, numChildren - 1, f, eCons, tail) and
mk_FieldCons(c, numChildren - 1, f, eCons, tail, cal)
)
or
cal.getNumChild() = 0 and
@@ -800,9 +803,10 @@ private predicate mk_ArrayCons(Type t, int i, HashCons hc, HC_Array hca, ArrayAg
private predicate mk_ArrayAggregateLiteral(Type t, HC_Array hca, ArrayAggregateLiteral aal) {
t = aal.getUnspecifiedType() and
(
exists(HashCons head, HC_Array tail |
hca = HC_ArrayCons(t, aal.getNumChild() - 1, head, tail) and
mk_ArrayCons(t, aal.getNumChild() - 1, head, tail, aal)
exists(HashCons head, HC_Array tail, int numElements |
numElements = aal.getNumChild() and
hca = HC_ArrayCons(t, numElements - 1, head, tail) and
mk_ArrayCons(t, numElements - 1, head, tail, aal)
)
or
aal.getNumChild() = 0 and