From 77bfe39ca7a4b85b9e322a9e13f0cecb21a773ee Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Mon, 26 Aug 2024 15:24:22 +0200
Subject: [PATCH] Shared: Address review comments.

---
 .../codeql/dataflow/internal/ContentDataFlowImpl.qll  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
index 1823a25155f..c63f36bdeda 100644
--- a/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
@@ -455,18 +455,15 @@ module MakeImplContentDataFlow<LocationSig Location, InputSig<Location> Lang> {
       )
     }
 
-    pragma[nomagic]
-    private predicate nodeAndState(Flow::PathNode n, Node node, State state) {
-      n.getNode() = node and n.getState() = state
-    }
-
     pragma[nomagic]
     private predicate succNodeAndState(
       Flow::PathNode pre, Node preNode, State preState, Flow::PathNode succ, Node succNode,
       State succState
     ) {
-      nodeAndState(pre, preNode, preState) and
-      nodeAndState(succ, succNode, succState) and
+      pre.getNode() = preNode and
+      pre.getState() = preState and
+      succ.getNode() = succNode and
+      succ.getState() = succState and
       pre.getASuccessor() = succ
     }