Fix semantic merge conflict.

aschackmull · aschackmull · commit ffc25f8f894b · 2021-10-14T13:06:41.000+02:00
diff --git a/ql/src/codeql_ql/ast/internal/Predicate.qll b/ql/src/codeql_ql/ast/internal/Predicate.qll
@@ -91,8 +91,8 @@ private module Cached {
     rel.getName() = pc.getPredicateName()
   }
 
-  private predicate resolveDBRelation(PredicateCall pc, DefinedPredicate p) {
-    exists(Relation rel | p = TPred(rel) |
+  private predicate resolveDBRelation(PredicateCall pc, Predicate p) {
+    exists(Relation rel | p = rel |
       candidate(rel, pc) and
       rel.getArity() = pc.getNumberOfArguments() and
       (

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ private module Cached {`
`91`	`91`	`rel.getName() = pc.getPredicateName()`
`92`	`92`	`}`
`93`	`93`
`94`		`- private predicate resolveDBRelation(PredicateCall pc, DefinedPredicate p) {`
`95`		`- exists(Relation rel \| p = TPred(rel) \|`
	`94`	`+ private predicate resolveDBRelation(PredicateCall pc, Predicate p) {`
	`95`	`+ exists(Relation rel \| p = rel \|`
`96`	`96`	`candidate(rel, pc) and`
`97`	`97`	`rel.getArity() = pc.getNumberOfArguments() and`
`98`	`98`	`(`