From 050d3018c8fbb8be42e31be92f5ad305f53e519c Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Tue, 30 May 2023 15:39:19 -0400
Subject: [PATCH] GP-3508 Fix for calcHash methods 5 and 6

---
 Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc     | 4 ++++
 .../main/java/ghidra/program/model/pcode/DynamicHash.java   | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc
index 84da5edc42..05658e854e 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc
@@ -236,6 +236,8 @@ void DynamicHash::calcHash(const PcodeOp *op,int4 slot,uint4 method)
 	buildOpUp(markop[opproc]);
       }
       gatherUnmarkedVn();
+      for(;vnproc<markvn.size();++vnproc)
+        buildVnUp(markvn[vnproc]);
       break;
     case 6:
       gatherUnmarkedOp();
@@ -243,6 +245,8 @@ void DynamicHash::calcHash(const PcodeOp *op,int4 slot,uint4 method)
 	buildOpDown(markop[opproc]);
       }
       gatherUnmarkedVn();
+      for(;vnproc<markvn.size();++vnproc)
+        buildVnDown(markvn[vnproc]);
       break;
     default:
       break;
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
index 54bfa6cf16..5423b73d4f 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
@@ -294,6 +294,9 @@ public class DynamicHash {
 					buildOpUp(markop.get(opproc));
 				}
 				gatherUnmarkedVn();
+				for (; vnproc < markvn.size(); ++vnproc) {
+					buildVnUp(markvn.get(vnproc));
+				}
 				break;
 			case 6:
 				gatherUnmarkedOp();
@@ -301,6 +304,9 @@ public class DynamicHash {
 					buildOpDown(markop.get(opproc));
 				}
 				gatherUnmarkedVn();
+				for (; vnproc < markvn.size(); ++vnproc) {
+					buildVnDown(markvn.get(vnproc));
+				}
 				break;
 			default:
 				break;