mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Kurtz
2019-11-18 08:23:19 -05:00
parent bb0a3d9f52 410b92c611
commit a0aff4fdec
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/SleighCompiler.g
View File

@@ -1246,7 +1246,17 @@ funcall returns [VectorSTL<OpTpl> value]
@init { @init {
$Return::noReturn = true; $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] build_stmt returns [VectorSTL<OpTpl> ops]