QL: Fix semantic merge conflict

aschackmull · aschackmull · commit 63b844856dd6 · 2021-10-14T13:12:11.000+02:00
diff --git a/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql b/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql
@@ -19,7 +19,7 @@ predicate usesThis(ClassPredicate pred) {
   or
   // implicit this
   exists(PredicateCall pc | pc.getEnclosingPredicate() = pred |
-    pc.getTarget().getDeclaration() instanceof ClassPredicate
+    pc.getTarget() instanceof ClassPredicate
   )
 }
 
@@ -39,7 +39,7 @@ predicate isLiteralComparison(ComparisonFormula eq) {
       rhs instanceof Literal
       or
       exists(NewTypeBranch nt |
-        rhs.(Call).getTarget().getDeclaration() = nt and
+        rhs.(Call).getTarget() = nt and
         count(nt.getField(_)) = 0
       )
     )

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ predicate usesThis(ClassPredicate pred) {`
`19`	`19`	`or`
`20`	`20`	`// implicit this`
`21`	`21`	`exists(PredicateCall pc \| pc.getEnclosingPredicate() = pred \|`
`22`		`- pc.getTarget().getDeclaration() instanceof ClassPredicate`
	`22`	`+ pc.getTarget() instanceof ClassPredicate`
`23`	`23`	`)`
`24`	`24`	`}`
`25`	`25`
`@@ -39,7 +39,7 @@ predicate isLiteralComparison(ComparisonFormula eq) {`
`39`	`39`	`rhs instanceof Literal`
`40`	`40`	`or`
`41`	`41`	`exists(NewTypeBranch nt \|`
`42`		`- rhs.(Call).getTarget().getDeclaration() = nt and`
	`42`	`+ rhs.(Call).getTarget() = nt and`
`43`	`43`	`count(nt.getField(_)) = 0`
`44`	`44`	`)`
`45`	`45`	`)`