Python: Moves non_local_control_flow to new API, and fixes bug in ClassValue implementation

BekaValentine · BekaValentine · commit e39a0c91218d · 2020-03-03T15:38:35.000-08:00
diff --git a/python/ql/src/Exceptions/EmptyExcept.ql b/python/ql/src/Exceptions/EmptyExcept.ql
@@ -31,7 +31,7 @@ predicate no_comment(ExceptStmt ex) {
 }
 
 predicate non_local_control_flow(ExceptStmt ex) {
-    ex.getType().refersTo(theStopIterationType())
+    ex.getType().pointsTo(ClassValue::stopIteration())
 }
 
 predicate try_has_normal_exit(Try try) {
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -839,7 +839,7 @@ module ClassValue {
     
     /** Get the `ClassValue` for the `StopIteration` class. */
     ClassValue stopIteration() {
-        result = TBuiltinClassObject(Builtin::special("StopIteration"))
+        result = TBuiltinClassObject(Builtin::builtin("StopIteration"))
     }
 
     /** Get the `ClassValue` for the class of modules. */

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ predicate no_comment(ExceptStmt ex) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`predicate non_local_control_flow(ExceptStmt ex) {`
`34`		`- ex.getType().refersTo(theStopIterationType())`
	`34`	`+ ex.getType().pointsTo(ClassValue::stopIteration())`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`predicate try_has_normal_exit(Try try) {`
Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ module ClassValue {`
`839`	`839`
`840`	`840`	/** Get the `ClassValue` for the `StopIteration` class. */
`841`	`841`	`ClassValue stopIteration() {`
`842`		`- result = TBuiltinClassObject(Builtin::special("StopIteration"))`
	`842`	`+ result = TBuiltinClassObject(Builtin::builtin("StopIteration"))`
`843`	`843`	`}`
`844`	`844`
`845`	`845`	/** Get the `ClassValue` for the class of modules. */