From 3067576168758c55c0289018f56929d9bbf01ba3 Mon Sep 17 00:00:00 2001
From: caheckman <caheckman@users.noreply.github.com>
Date: Tue, 26 Mar 2019 16:27:26 -0400
Subject: [PATCH] Fix for GT-2682

---
 .../src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g b/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g
index ba0bffac28..7170783b57 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g
+++ b/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g
@@ -1473,8 +1473,10 @@ expr_apply returns [Object value]
 	;
 
 expr_operands returns [VectorSTL<ExprTree> value]
+	scope Return;
 	@init {
 		$value = new VectorSTL<ExprTree>();
+		$Return::noReturn = false;
 	}
 	:	(e=expr { value.push_back(e); })*
 	;