C++: typeid and noexcept fixes in HashCons

Robert Marsh · Robert Marsh · commit bbafcd99414a · 2018-09-10T12:22:45.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/valuenumbering/HashCons.qll b/cpp/ql/src/semmle/code/cpp/valuenumbering/HashCons.qll
@@ -704,7 +704,8 @@ private predicate mk_UuidofOperator(Type t, UuidofOperator e) {
 }
 
 private predicate analyzableTypeidType(TypeidOperator e) {
-  count(e.getAChild()) = 0
+  count(e.getAChild()) = 0 and
+  strictcount(e.getResultType()) = 1
 }
 
 private predicate mk_TypeidType(Type t, TypeidOperator e) {
@@ -858,7 +859,7 @@ private predicate analyzableNoExceptExpr(NoExceptExpr nee) {
 
 private predicate mk_NoExceptExpr(HashCons child, NoExceptExpr nee) {
   analyzableNoExceptExpr(nee) and
-  nee.getExpr() = child.getAnExpr().getFullyConverted()
+  nee.getExpr().getFullyConverted() = child.getAnExpr()
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,8 @@ private predicate mk_UuidofOperator(Type t, UuidofOperator e) {`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`private predicate analyzableTypeidType(TypeidOperator e) {`
`707`		`- count(e.getAChild()) = 0`
	`707`	`+ count(e.getAChild()) = 0 and`
	`708`	`+ strictcount(e.getResultType()) = 1`
`708`	`709`	`}`
`709`	`710`
`710`	`711`	`private predicate mk_TypeidType(Type t, TypeidOperator e) {`
`@@ -858,7 +859,7 @@ private predicate analyzableNoExceptExpr(NoExceptExpr nee) {`
`858`	`859`
`859`	`860`	`private predicate mk_NoExceptExpr(HashCons child, NoExceptExpr nee) {`
`860`	`861`	`analyzableNoExceptExpr(nee) and`
`861`		`- nee.getExpr() = child.getAnExpr().getFullyConverted()`
	`862`	`+ nee.getExpr().getFullyConverted() = child.getAnExpr()`
`862`	`863`	`}`
`863`	`864`
`864`	`865`