Address review comments

hvitved · hvitved · commit 7fd8d6dd3077 · 2022-02-10T10:29:30.000+01:00
diff --git a/python/ql/lib/semmle/python/pointsto/MRO.qll b/python/ql/lib/semmle/python/pointsto/MRO.qll
@@ -173,7 +173,7 @@ class ClassList extends TClassList {
     this.duplicate(n) and result = this.deduplicate(n + 1)
     or
     exists(ClassObjectInternal cls, ClassList tail |
-      deduplicateCons(n, cls, tail) and
+      this.deduplicateCons(n, cls, tail) and
       result = Cons(cls, tail)
     )
   }
@@ -281,17 +281,17 @@ private class ClassListList extends TClassListList {
     removed_head = this.removedClassPartsCons1(cls, removed_tail, n).removeHead(cls)
   }
 
-  pragma[noinline]
+  pragma[nomagic]
   predicate removedClassPartsCons0(ClassObjectInternal cls, ClassListList removed_tail, int n) {
     exists(ClassList prev_head, ClassListList prev_tail |
       this.removedClassParts(cls, prev_head, prev_tail, n + 1) and
       removed_tail = ConsList(prev_head, prev_tail)
     )
   }
 
-  pragma[noinline]
+  pragma[nomagic]
   ClassList removedClassPartsCons1(ClassObjectInternal cls, ClassListList removed_tail, int n) {
-    removedClassPartsCons0(cls, removed_tail, n) and
+    this.removedClassPartsCons0(cls, removed_tail, n) and
     result = this.getItem(n)
   }
 
@@ -310,7 +310,7 @@ private class ClassListList extends TClassListList {
     cl = this.getItem(n) and
     j = cl.length()
     or
-    legalMergeCandidateNonEmpty(cls, n, cl, j + 1) and
+    this.legalMergeCandidateNonEmpty(cls, n, cl, j + 1) and
     j >= 1 and
     cls != cl.getItem(j)
   }
@@ -321,14 +321,14 @@ private class ClassListList extends TClassListList {
     this.legalMergeCandidate(cls, n + 1) and
     this.getItem(n) = Empty()
     or
-    legalMergeCandidateNonEmpty(cls, n, _, 1)
+    this.legalMergeCandidateNonEmpty(cls, n, _, 1)
   }
 
   predicate legalMergeCandidate(ClassObjectInternal cls) { this.legalMergeCandidate(cls, 0) }
 
   predicate illegalMergeCandidate(ClassObjectInternal cls) {
     exists(ClassList cl, int j |
-      legalMergeCandidateNonEmpty(cls, _, cl, j + 1) and
+      this.legalMergeCandidateNonEmpty(cls, _, cl, j + 1) and
       j >= 1 and
       cls = cl.getItem(j)
     )

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class ClassList extends TClassList {`
`173`	`173`	`this.duplicate(n) and result = this.deduplicate(n + 1)`
`174`	`174`	`or`
`175`	`175`	`exists(ClassObjectInternal cls, ClassList tail \|`
`176`		`- deduplicateCons(n, cls, tail) and`
	`176`	`+ this.deduplicateCons(n, cls, tail) and`
`177`	`177`	`result = Cons(cls, tail)`
`178`	`178`	`)`
`179`	`179`	`}`
`@@ -281,17 +281,17 @@ private class ClassListList extends TClassListList {`
`281`	`281`	`removed_head = this.removedClassPartsCons1(cls, removed_tail, n).removeHead(cls)`
`282`	`282`	`}`
`283`	`283`
`284`		`- pragma[noinline]`
	`284`	`+ pragma[nomagic]`
`285`	`285`	`predicate removedClassPartsCons0(ClassObjectInternal cls, ClassListList removed_tail, int n) {`
`286`	`286`	`exists(ClassList prev_head, ClassListList prev_tail \|`
`287`	`287`	`this.removedClassParts(cls, prev_head, prev_tail, n + 1) and`
`288`	`288`	`removed_tail = ConsList(prev_head, prev_tail)`
`289`	`289`	`)`
`290`	`290`	`}`
`291`	`291`
`292`		`- pragma[noinline]`
	`292`	`+ pragma[nomagic]`
`293`	`293`	`ClassList removedClassPartsCons1(ClassObjectInternal cls, ClassListList removed_tail, int n) {`
`294`		`- removedClassPartsCons0(cls, removed_tail, n) and`
	`294`	`+ this.removedClassPartsCons0(cls, removed_tail, n) and`
`295`	`295`	`result = this.getItem(n)`
`296`	`296`	`}`
`297`	`297`
`@@ -310,7 +310,7 @@ private class ClassListList extends TClassListList {`
`310`	`310`	`cl = this.getItem(n) and`
`311`	`311`	`j = cl.length()`
`312`	`312`	`or`
`313`		`- legalMergeCandidateNonEmpty(cls, n, cl, j + 1) and`
	`313`	`+ this.legalMergeCandidateNonEmpty(cls, n, cl, j + 1) and`
`314`	`314`	`j >= 1 and`
`315`	`315`	`cls != cl.getItem(j)`
`316`	`316`	`}`
`@@ -321,14 +321,14 @@ private class ClassListList extends TClassListList {`
`321`	`321`	`this.legalMergeCandidate(cls, n + 1) and`
`322`	`322`	`this.getItem(n) = Empty()`
`323`	`323`	`or`
`324`		`- legalMergeCandidateNonEmpty(cls, n, _, 1)`
	`324`	`+ this.legalMergeCandidateNonEmpty(cls, n, _, 1)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`predicate legalMergeCandidate(ClassObjectInternal cls) { this.legalMergeCandidate(cls, 0) }`
`328`	`328`
`329`	`329`	`predicate illegalMergeCandidate(ClassObjectInternal cls) {`
`330`	`330`	`exists(ClassList cl, int j \|`
`331`		`- legalMergeCandidateNonEmpty(cls, _, cl, j + 1) and`
	`331`	`+ this.legalMergeCandidateNonEmpty(cls, _, cl, j + 1) and`
`332`	`332`	`j >= 1 and`
`333`	`333`	`cls = cl.getItem(j)`
`334`	`334`	`)`