Remove extra increment of plpgsql's statement counter for FOR loops.

This left gaps in the internal statement numbering, which is not
terribly harmful (else we'd have noticed sooner), but it's not
great either.

Oversight in bbd5c207b; backpatch to v12 where that came in.

Pavel Stehule

Discussion: https://postgr.es/m/CAFj8pRDXyQaJmpotNTQVc-t-WxdWZC35V2PnmwOaV1-taidFWA@mail.gmail.com

diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index af63fe126f9f437897649bf05ce8c71a663c5a83..12f75ed2bb95921339e53276292b2ccfe50e542a 100644 (file)
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -1304,7 +1304,6 @@ stmt_for      : opt_loop_label K_FOR for_control loop_body
 
                            new = (PLpgSQL_stmt_fori *) $3;
                            new->lineno   = plpgsql_location_to_lineno(@2);
-                           new->stmtid   = ++plpgsql_curr_compile->nstatements;
                            new->label    = $1;
                            new->body     = $4.stmts;
                            $$ = (PLpgSQL_stmt *) new;
@@ -1319,7 +1318,6 @@ stmt_for      : opt_loop_label K_FOR for_control loop_body
                            /* forq is the common supertype of all three */
                            new = (PLpgSQL_stmt_forq *) $3;
                            new->lineno   = plpgsql_location_to_lineno(@2);
-                           new->stmtid   = ++plpgsql_curr_compile->nstatements;
                            new->label    = $1;
                            new->body     = $4.stmts;
                            $$ = (PLpgSQL_stmt *) new;