Cases generator gets confused about the number of values to pop in case of errors in some macros

[markshannon]

Bug report

Bug description:

This input:

 op(FIRST, (x, y -- a, b)){
 a = x;
 b = y;
 }

 op(SECOND, (a, b -- a, b)){
 }

 op(THIRD, (j, k --)){
 ERROR_IF(cond, error);
 }

 macro(TEST) = FIRST + SECOND + THIRD;
 """

Generates:

 ...
 if (cond) goto pop_4_error;
 ...

This should be if (cond) goto pop_2_error;

I noticed this error when working on a fix to #122029, so this isn't just a theoretical bug.

CPython versions tested on:

CPython main branch

Operating systems tested on:

No response

Linked PRs

• GH-122155: Fix cases generator to correctly compute 'peek' offset for error handling #122158
• [3.13] GH-122155: Fix cases generator to correctly compute 'peek' offset for error handling (GH-122158) #122174
• GH-122155: Track local variables between pops and pushes in cases generator #122286