From cd3839f621cb7cc812a568990ae6ea20bcf62ec0 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Thu, 14 Oct 2021 13:12:11 +0200
Subject: [PATCH] Fix semantic merge conflict

---
 ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql b/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql
index 3bd8237d798..94fe2067486 100644
--- 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
       )
     )