gac: avoid redundant final return

When coding functions we already ensure there is a final `return` statement in there, so there is no need for gac to add yet another.
fingolfin · Jan 4, 2025 · d89dff3 · d89dff3
1 parent 9438741
commit d89dff3
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 237 deletions.
diff --git a/src/compiler.c b/src/compiler.c
@@ -5163,11 +5163,6 @@ static void CompFunc(Obj func)
     // compile the body
     CompStat( OFFSET_FIRST_STAT );
 
-    // emit the code to switch back to the old frame and return
-    Emit( "\n/* return; */\n" );
-
-    Emit( "SWITCH_TO_OLD_FRAME(oldFrame);\n" );
-    Emit( "return 0;\n" );
     Emit( "}\n" );
 
     // switch back to old frame

diff --git a/tst/test-compile/and_filter.g.dynamic.c b/tst/test-compile/and_filter.g.dynamic.c
@@ -49,10 +49,6 @@ static Obj  HdlrFunc3 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 4 */
@@ -78,10 +74,6 @@ static Obj  HdlrFunc4 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 5 */
@@ -120,10 +112,6 @@ static Obj  HdlrFunc5 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 6 */
@@ -162,10 +150,6 @@ static Obj  HdlrFunc6 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 7 */
@@ -198,10 +182,6 @@ static Obj  HdlrFunc7 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 8 */
@@ -228,10 +208,6 @@ static Obj  HdlrFunc8 (
  }
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 2 */
@@ -460,10 +436,6 @@ static Obj  HdlrFunc2 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 1 */
@@ -514,10 +486,6 @@ static Obj  HdlrFunc1 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* 'PostRestore' restore gvars, rnams, functions */

diff --git a/tst/test-compile/assert.g.dynamic.c b/tst/test-compile/assert.g.dynamic.c
@@ -198,10 +198,6 @@ static Obj  HdlrFunc2 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 1 */
@@ -243,10 +239,6 @@ static Obj  HdlrFunc1 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* 'PostRestore' restore gvars, rnams, functions */

diff --git a/tst/test-compile/basics.g.dynamic.c b/tst/test-compile/basics.g.dynamic.c
@@ -299,10 +299,6 @@ static Obj  HdlrFunc2 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 4 */
@@ -320,10 +316,6 @@ static Obj  HdlrFunc4 (
  C_LEN_LIST_FPL( t_1, a_args )
  SWITCH_TO_OLD_FRAME(oldFrame);
  return t_1;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 5 */
@@ -351,10 +343,6 @@ static Obj  HdlrFunc5 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 3 */
@@ -749,10 +737,6 @@ static Obj  HdlrFunc3 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 6 */
@@ -1434,10 +1418,6 @@ static Obj  HdlrFunc6 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 7 */
@@ -1470,10 +1450,6 @@ static Obj  HdlrFunc7 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 8 */
@@ -1490,10 +1466,6 @@ static Obj  HdlrFunc8 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 9 */
@@ -1744,10 +1716,6 @@ static Obj  HdlrFunc9 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 10 */
@@ -2093,10 +2061,6 @@ static Obj  HdlrFunc10 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 11 */
@@ -2289,10 +2253,6 @@ static Obj  HdlrFunc11 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 12 */
@@ -2391,10 +2351,6 @@ static Obj  HdlrFunc12 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* handler for function 1 */
@@ -2792,10 +2748,6 @@ static Obj  HdlrFunc1 (
  /* return; */
  SWITCH_TO_OLD_FRAME(oldFrame);
  return 0;
-
- /* return; */
- SWITCH_TO_OLD_FRAME(oldFrame);
- return 0;
 }
 
 /* 'PostRestore' restore gvars, rnams, functions */