Python points-to: Infer types for comprehensions.

markshannon · markshannon · commit 27c0571a8650 · 2019-07-25T14:18:05.000+01:00
diff --git a/python/ql/src/semmle/python/objects/TObject.qll b/python/ql/src/semmle/python/objects/TObject.qll
@@ -253,6 +253,12 @@ predicate literal_instantiation(ControlFlowNode n, ClassObjectInternal cls, Poin
         n instanceof SetNode and cls = ObjectInternal::builtin("set")
         or
         n.getNode() instanceof ImaginaryLiteral and cls = ObjectInternal::builtin("complex")
+        or
+        n.getNode() instanceof ListComp and cls = ObjectInternal::builtin("list")
+        or
+        n.getNode() instanceof SetComp and cls = ObjectInternal::builtin("set")
+        or
+        n.getNode() instanceof DictComp and cls = ObjectInternal::builtin("dict")
     )
 }
 
diff --git a/python/ql/test/query-tests/analysis/pointsto/CallGraphEfficiency.expected b/python/ql/test/query-tests/analysis/pointsto/CallGraphEfficiency.expected
@@ -1,2 +1,2 @@
-| 0 | 77 | 77 | 100.0 |
-| 1 | 5 | 43 | 11.627906976744185 |
+| 0 | 81 | 81 | 100.0 |
+| 1 | 6 | 44 | 13.636363636363637 |
diff --git a/python/ql/test/query-tests/analysis/pointsto/CallGraphMarginalEfficiency.expected b/python/ql/test/query-tests/analysis/pointsto/CallGraphMarginalEfficiency.expected
@@ -1,2 +1,2 @@
-| 0 | 77 | 77 | 100.0 |
-| 1 | 3 | 43 | 6.976744186046512 |
+| 0 | 81 | 81 | 100.0 |
+| 1 | 3 | 44 | 6.818181818181818 |
diff --git a/python/ql/test/query-tests/analysis/pointsto/Pruned.expected b/python/ql/test/query-tests/analysis/pointsto/Pruned.expected
@@ -1 +1 @@
-| 1231 |
+| 1189 |

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,12 @@ predicate literal_instantiation(ControlFlowNode n, ClassObjectInternal cls, Poin`
`253`	`253`	`n instanceof SetNode and cls = ObjectInternal::builtin("set")`
`254`	`254`	`or`
`255`	`255`	`n.getNode() instanceof ImaginaryLiteral and cls = ObjectInternal::builtin("complex")`
	`256`	`+ or`
	`257`	`+ n.getNode() instanceof ListComp and cls = ObjectInternal::builtin("list")`
	`258`	`+ or`
	`259`	`+ n.getNode() instanceof SetComp and cls = ObjectInternal::builtin("set")`
	`260`	`+ or`
	`261`	`+ n.getNode() instanceof DictComp and cls = ObjectInternal::builtin("dict")`
`256`	`262`	`)`
`257`	`263`	`}`
`258`	`264`