[3.11] gh-101400: Fix incorrect lineno in exception message on contin… (gh-101447)

This commit is contained in:
Dong-hee Na 2023-01-31 23:53:14 +09:00 committed by GitHub
parent 43af2dbb54
commit 0c37ea9aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 13 deletions

View file

@ -3259,12 +3259,20 @@ static int
compiler_break(struct compiler *c)
{
struct fblockinfo *loop = NULL;
int u_lineno = c->u->u_lineno;
int u_col_offset = c->u->u_col_offset;
int u_end_lineno = c->u->u_end_lineno;
int u_end_col_offset = c->u->u_end_col_offset;
/* Emit instruction with line number */
ADDOP(c, NOP);
if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
return 0;
}
if (loop == NULL) {
c->u->u_lineno = u_lineno;
c->u->u_col_offset = u_col_offset;
c->u->u_end_lineno = u_end_lineno;
c->u->u_end_col_offset = u_end_col_offset;
return compiler_error(c, "'break' outside loop");
}
if (!compiler_unwind_fblock(c, loop, 0)) {
@ -3278,12 +3286,20 @@ static int
compiler_continue(struct compiler *c)
{
struct fblockinfo *loop = NULL;
int u_lineno = c->u->u_lineno;
int u_col_offset = c->u->u_col_offset;
int u_end_lineno = c->u->u_end_lineno;
int u_end_col_offset = c->u->u_end_col_offset;
/* Emit instruction with line number */
ADDOP(c, NOP);
if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
return 0;
}
if (loop == NULL) {
c->u->u_lineno = u_lineno;
c->u->u_col_offset = u_col_offset;
c->u->u_end_lineno = u_end_lineno;
c->u->u_end_col_offset = u_end_col_offset;
return compiler_error(c, "'continue' not properly in loop");
}
ADDOP_JUMP(c, JUMP, loop->fb_block);