From 0df10bda0c8741edd50d015cc284db41f77da5c8 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:32:59 +0000
Subject: [PATCH] C++: Post-merge fixup.

---
 .../code/cpp/ir/dataflow/internal/DataFlowUtil.qll   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index b264df42699..52cfae651d8 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -54,7 +54,6 @@ private newtype TIRDataFlowNode =
     Ssa::hasRawIndirectInstruction(node.asInstruction(), indirectionIndex)
   } or
   TFinalParameterNode(Parameter p, int indirectionIndex) {
-    hasFinalParameterNode(_, p, indirectionIndex)
     exists(Ssa::FinalParameterUse use |
       use.getParameter() = p and
       use.getIndirectionIndex() = indirectionIndex
@@ -64,17 +63,6 @@ private newtype TIRDataFlowNode =
   TInitialGlobalValue(Ssa::GlobalDef globalUse) or
   TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
 
-/**
- * Holds if `(p, indirectionIndex)` should define a `TFinalParameterNode`
- * entry because `use` represents the final use of a parameter that has been
- * written to in the enclosing function of `p`.
- */
-predicate hasFinalParameterNode(Ssa::FinalParameterUse use, Parameter p, int indirectionIndex) {
-  use.getParameter() = p and
-  use.getIndirectionIndex() = indirectionIndex and
-  parameterIsRedefined(p)
-}
-
 /**
  * An operand that is defined by a `FieldAddressInstruction`.
  */