From b1cb6573ba72289a15e91fd006430e616bb042da Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Fri, 10 Jul 2026 20:38:29 +0000
Subject: [PATCH] GP-7058 Fix COPY path

---
 .../Features/Decompiler/src/decompile/cpp/condexe.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
index 97d7459eeb..67a01dee3a 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
@@ -244,13 +244,13 @@ Varnode *ConditionalExecution::resolveIblockRead(PcodeOp *op,int4 inbranch)
 {
   if (op->code() == CPUI_COPY) {
     Varnode *vn = op->getIn(0);
-    if (vn->isWritten()) {
-      PcodeOp *defOp = vn->getDef();
-      if (defOp->code() == CPUI_MULTIEQUAL && defOp->getParent() == iblock)
-	op = defOp;
-    }
-    else
+    if (!vn->isWritten())
       return vn;
+    PcodeOp *defOp = vn->getDef();
+    if (defOp->code() == CPUI_MULTIEQUAL && defOp->getParent() == iblock)
+      op = defOp;
+    else
+      return vn;	// We know defOp is not in iblock
   }
   OpCode opc = op->code();
   if (opc == CPUI_MULTIEQUAL)