bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Do not output a warning about a missing "return" in a function if the function

Browse Source 
exit is unreachable.
This commit is contained in:
Kugel Fuhr
2025-07-17 16:12:48 +02:00
parent ed54e9b168
commit 6d45a94127
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc65/error.c
View File

@@ -433,7 +433,7 @@ void UnreachableCodeWarning (void)
*/ */
if (CurTok.LI && NextTok.LI) { if (CurTok.LI && NextTok.LI) {
if (CurTok.Tok == TOK_LCURLY) { if (CurTok.Tok == TOK_LCURLY) {
/* Do not point to the compoung statement but to the first /* Do not point to the compound statement but to the first
** statement within it. If the compound statement is empty ** statement within it. If the compound statement is empty
** do not even output a warning. This fails of course for ** do not even output a warning. This fails of course for
** nested compounds but will do the right thing in most cases. ** nested compounds but will do the right thing in most cases.

7
src/cc65/function.c
View File

@@ -453,6 +453,7 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
SymEntry* Param; SymEntry* Param;
const Type* RType; /* Real type used for struct parameters */ const Type* RType; /* Real type used for struct parameters */
const Type* ReturnType; /* Return type */ const Type* ReturnType; /* Return type */
int StmtFlags; /* Flow control flags for the function compound */
/* Remember this function descriptor used for definition */ /* Remember this function descriptor used for definition */
GetFuncDesc (Func->Type)->FuncDef = D; GetFuncDesc (Func->Type)->FuncDef = D;
@@ -627,10 +628,12 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
CurrentFunc->TopLevelSP = StackPtr; CurrentFunc->TopLevelSP = StackPtr;
/* Now process statements in this block checking for unreachable code */ /* Now process statements in this block checking for unreachable code */
StatementBlock (0); StmtFlags = StatementBlock (0);
/* Check if this function is missing a return value */ /* Check if this function is missing a return value */
if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc)) { if (!SF_Unreach (StmtFlags) &&
!F_HasVoidReturn (CurrentFunc) &&
!F_HasReturn (CurrentFunc)) {
/* If this is the main function in a C99 environment returning an int, /* If this is the main function in a C99 environment returning an int,
** let it always return zero. Otherwise output a warning. ** let it always return zero. Otherwise output a warning.
*/ */