aerscript/Aer
0
5
Fork 0
Code Issues 3 Pull Requests Actions Releases 2 Wiki Activity

Warn when non-void methods and closures finish without returning
Build / AerScript (push) Successful in 40s
Details

Browse Source
This commit is contained in:
belliash
2026-10-26 18:39:37 +01:00
parent 7ae2412a88
commit 329305c071
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/compiler.c
+2 -2
View File
@@ -3133,8 +3133,8 @@ static sxi32 PH7_GenStateCompileFuncBody(
PH7_CompileBlock(&(*pGen));
/* Fix exception jumps now the destination is resolved */
PH7_GenStateFixJumps(pGen->pCurrent, PH7_OP_THROW, PH7_VmInstrLength(pGen->pVm));
/* Emit the final return if not yet done */
PH7_VmEmitInstr(pGen->pVm, pGen->pIn->nLine, PH7_OP_DONE, 0, 0, 0, 0);
/* Mark the implicit function epilogue, distinct from other DONE instructions. */
PH7_VmEmitInstr(pGen->pVm, pGen->pIn->nLine, PH7_OP_DONE, 0, 1, 0, 0);
/* Fix gotos jumps now the destination is resolved */
if(SXERR_ABORT == GenStateFixGoto(&(*pGen), nGotoOfft)) {
rc = SXERR_ABORT;
engine/vm.c
+8
View File
@@ -2723,6 +2723,14 @@ Resume:
*/
case PH7_OP_DONE:
bReturning = pInstr->p3 != 0;
/* Only normal fallthrough of a function body requires a result.
* Keep the call's NULL result unconverted, unlike explicit return. */
if(!pInstr->iP1 && pInstr->iP2 && (pEntryFrame->iFlags & VM_FRAME_ACTIVE) && (pEntryFrame->iFlags & VM_FRAME_THROW) == 0) {
ph7_vm_func *pFunc = (ph7_vm_func *)pEntryFrame->pUserData;
if(pFunc->nType && (pFunc->nType & MEMOBJ_VOID) == 0) {
PH7_VmThrowError(&(*pVm), PH7_CTX_WARNING, "Missing return value in closure/method returning non-void");
}
}
if(bReturning && !pInstr->iP1 && (iExecFlags & VM_EXEC_INCLUDE) && pResult) {
PH7_MemObjRelease(pResult);
MemObjSetType(pResult, MEMOBJ_NULL);