Python: Simplify class_var_scope

tausbn · yoff · web-flow · commit 1f5176d62361 · 2022-08-16T14:02:47.000+02:00
Co-authored-by: yoff &lt;lerchedahl@gmail.com&gt;
diff --git a/python/ql/lib/semmle/python/types/ImportTime.qll b/python/ql/lib/semmle/python/types/ImportTime.qll
@@ -40,8 +40,7 @@ private predicate global_var_scope(string name, Scope scope, GlobalVariable var)
 }
 
 pragma[nomagic]
-private predicate class_var_scope(Scope scope, string name, LocalVariable var) {
-  var.getScope() = scope and
-  scope instanceof Class and
+private predicate class_var_scope(Class cls, string name, LocalVariable var) {
+  var.getScope() = cls and
   var.getId() = name
 }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ private predicate global_var_scope(string name, Scope scope, GlobalVariable var)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`pragma[nomagic]`
`43`		`-private predicate class_var_scope(Scope scope, string name, LocalVariable var) {`
`44`		`- var.getScope() = scope and`
`45`		`- scope instanceof Class and`
	`43`	`+private predicate class_var_scope(Class cls, string name, LocalVariable var) {`
	`44`	`+ var.getScope() = cls and`
`46`	`45`	`var.getId() = name`
`47`	`46`	`}`