From ebce060f34b154a8068f9aef9b791a77cc2b0b14 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Wed, 15 Nov 2023 11:56:17 -0500
Subject: [PATCH] GP-4013: Select context before trying to backfill

---
 .../app/plugin/assembler/sleigh/sem/AssemblyTreeResolver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyTreeResolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyTreeResolver.java
index a3f0e2ce9a..e66b275be6 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyTreeResolver.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyTreeResolver.java
@@ -114,8 +114,8 @@ public class AssemblyTreeResolver {
 		patStream.forEach(results::add);
 
 		results = resolveRootRecursion(results);
-		results = resolvePendingBackfills(results);
 		results = selectContext(results);
+		results = resolvePendingBackfills(results);
 		// TODO: Remove this? It's subsumed by filterByDisassembly, and more accurately....
 		results = filterForbidden(results);
 		results = filterByDisassembly(results);