From a985a9ca7a1ad9f5bc5c50d8a4926f08777eb293 Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Wed, 1 Mar 2023 22:20:33 -0600
Subject: [PATCH] Simplify code generation for function parameters.

The old approach would call GenerateCode twice for each parameter expression. Now, it is only called once. This is faster, and also avoids some oddities with error handling. With the previous approach, expressionType would not be set if there was an error in the expression, which could lead to additional spurious errors. Also, a lint message treated as a warning could appear twice.
---
 Expression.pas | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/Expression.pas b/Expression.pas
index 4e5f4b5..058ca51 100644
--- a/Expression.pas
+++ b/Expression.pas
@@ -3346,9 +3346,7 @@ var
       {    fType - function type                                }
 
       var
-         kind: typeKind;                {for expression kinds}
          ldoDispose: boolean;           {local copy of doDispose}
-         lnumErrors: integer;		{number of errors before type check}
          numParms: integer;             {# of parameters generated}
          parameters: parameterPtr;      {next prototyped parameter}
          pCount: integer;               {# of parameters prototyped}
@@ -3430,25 +3428,20 @@ var
       doDispose := false;
       while tp <> nil do begin
          if tp^.middle <> nil then begin
-            lnumErrors := numErrors;
-            kind := ExpressionKind(tp^.middle);
-            if numErrors = lnumErrors then
-               if kind in [structType,unionType] then begin
-        	  GenerateCode(tp^.middle);
-        	  if expressionType^.size & $FFFF8000 <> 0 then
-                     Error(61);
-        	  Gen1t(pc_ldc, long(expressionType^.size).lsw, cgWord);
-        	  Gen0(pc_psh);
-        	  end {else if}
-               else
-        	  GenerateCode(tp^.middle);
+            GenerateCode(tp^.middle);
+            if expressionType^.kind in [structType,unionType] then begin
+               if expressionType^.size & $FFFF8000 <> 0 then
+                  Error(61);
+               Gen1t(pc_ldc, long(expressionType^.size).lsw, cgWord);
+               Gen0(pc_psh);
+               end; {if}
             if fmt <> fmt_none then begin
-                new(tfp);
-                tfp^.next := fp;
-                tfp^.tk := tp^.middle;
-                tfp^.ty := expressionType;
-                fp := tfp;
-            end;
+               new(tfp);
+               tfp^.next := fp;
+               tfp^.tk := tp^.middle;
+               tfp^.ty := expressionType;
+               fp := tfp;
+               end; {if}
             if prototype then begin
                if pCount = 0 then begin
                   if parameters <> nil then begin