compiler: add break label in 1,2-case select statement lowering

CL 184998 added optimizations for one- and two-case select
    statements. But it didn't handle break statement in the select
    case correctly. Specifically, it didn't add the label definition,
    so it could result in a dangling goto. This CL fixes this, by
    adding the label definition.
    
    A test case is CL 185520.
    
    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/185519

From-SVN: r273359
This commit is contained in:
Ian Lance Taylor 2019-07-10 17:56:40 +00:00
parent b59ff58620
commit 41112d9519
2 changed files with 9 additions and 1 deletions

View File

@ -1,4 +1,4 @@
7a8e10be0ddb8909ce25a264d03b24cee4df60cc
170ecdf6b2eab8aac2b8c852fa95d3c36d6bf604
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

View File

@ -5855,6 +5855,10 @@ Select_statement::lower_one_case(Block* b)
Statement::make_block_statement(scase.statements(), scase.location());
b->add_statement(bs);
Statement* label =
Statement::make_unnamed_label_statement(this->break_label());
b->add_statement(label);
this->is_lowered_ = true;
return Statement::make_block_statement(b, loc);
}
@ -5958,6 +5962,10 @@ Select_statement::lower_two_case(Block* b)
Statement::make_if_statement(call, bchan, defcase.statements(), loc);
b->add_statement(ifs);
Statement* label =
Statement::make_unnamed_label_statement(this->break_label());
b->add_statement(label);
this->is_lowered_ = true;
return Statement::make_block_statement(b, loc);
}