procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compiler: use correct assignment order for type assertions

Browse source 
For "a, b := v.(T)" we must set a before b.

For golang/go#13433

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/273906
This commit is contained in:
Ian Lance Taylor 2020-11-28 18:47:42 -08:00
parent 8d8fea8a57
commit c7f272e05e
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View file

@ -1,4 +1,4 @@
af683486b4de5503b2b6d9ae974a2ab1eeb92290
213abeedc85ed638a878f9457e422897fda3a111
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

28
gcc/go/gofrontend/statements.cc
View file

@ -1985,18 +1985,42 @@ Tuple_type_guard_assignment_statement::lower_to_object_type(
NULL, loc);
b->add_statement(val_temp);
// ok = CODE(type_descriptor, expr, &val_temp)
// var ok_temp bool
Temporary_statement* ok_temp = NULL;
if (!this->ok_->is_sink_expression())
{
ok_temp = Statement::make_temporary(this->ok_->type(),
NULL, loc);
b->add_statement(ok_temp);
}
// ok_temp = CODE(type_descriptor, expr, &val_temp)
Expression* p1 = Expression::make_type_descriptor(this->type_, loc);
Expression* ref = Expression::make_temporary_reference(val_temp, loc);
Expression* p3 = Expression::make_unary(OPERATOR_AND, ref, loc);
Expression* call = Runtime::make_call(code, loc, 3, p1, this->expr_, p3);
Statement* s = Statement::make_assignment(this->ok_, call, loc);
Statement* s;
if (ok_temp == NULL)
s = Statement::make_statement(call, true);
else
{
Expression* ok_ref = Expression::make_temporary_reference(ok_temp, loc);
s = Statement::make_assignment(ok_ref, call, loc);
}
b->add_statement(s);
// val = val_temp
ref = Expression::make_temporary_reference(val_temp, loc);
s = Statement::make_assignment(this->val_, ref, loc);
b->add_statement(s);
// ok = ok_temp
if (ok_temp != NULL)
{
ref = Expression::make_temporary_reference(ok_temp, loc);
s = Statement::make_assignment(this->ok_, ref, loc);
b->add_statement(s);
}
}
// Dump the AST representation for a tuple type guard statement.