Merge remote-tracking branch 'origin/GT-3319_SleighFunctionCall'

NationalSecurityAgency · Nov 18, 2019 · a0aff4f · a0aff4f
2 parents bb0a3d9 + 410b92c
commit a0aff4f
Showing 1 changed file with 11 additions and 1 deletion.
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
@@ -1246,7 +1246,17 @@ funcall returns [VectorSTL<OpTpl> value]
 	@init {
 		$Return::noReturn = true;
 	}
-	:	e=expr_apply { $value = (VectorSTL<OpTpl>) e; }
+	:	e=expr_apply {
+			if (e instanceof VectorSTL<?>)
+				$value = (VectorSTL<OpTpl>) e;
+			else {
+				Location loc = null;
+				if (e instanceof ExprTree) {
+					loc = ((ExprTree)e).location;
+				}
+				reportError(loc,"Functional operator requires a return value");
+			}
+		}
 	;
 
 build_stmt returns [VectorSTL<OpTpl> ops]