From bec92c3bdc18a6cba821f5b1cefb4f46a259fe71 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 8 Aug 2023 10:02:00 -0400
Subject: [PATCH] GP-3720: Fix error in tracking drop-down with certain
 watches.

---
 .../src/main/java/ghidra/pcode/exec/SleighUtils.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighUtils.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighUtils.java
index b0c0251289..aa8dbe11bc 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighUtils.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighUtils.java
@@ -308,9 +308,12 @@ public enum SleighUtils {
 						match(tree, SleighParser.OP_DEREFERENCE, onSize, onOffset);
 						return;
 					default:
-						throw new AssertionError(
-							"OP_DEREFERENCE with 2 children where child[0] is " +
-								SleighParser.tokenNames[child0.getType()]);
+						matchTree(tree, SleighParser.OP_DEREFERENCE, children -> {
+							throw new AssertionError(
+								"OP_DEREFERENCE with 2 children where child[0] is " +
+									SleighParser.tokenNames[child0.getType()]);
+						});
+						return;
 				}
 			case 1:
 				match(tree, SleighParser.OP_DEREFERENCE, onOffset);