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

compiler: call runtime.eqtype for non-interface type switch on aix

Browse source 
All type switch clauses must call runtime.eqtype if the linker isn't
able to merge type descriptors pointers. Previously, only interface-type
clauses were doing it.

Updates golang/go#39276

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/255202
This commit is contained in:
Clément Chigot 2020-09-16 14:03:10 +02:00 • committed by Ian Lance Taylor
parent f74c87f85f
commit 30bf947649
3 changed files with 21 additions and 12 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 @@
a59167c29d6ad2ddf533b3a12b365f72df0e1476
b24062f0b2e8f6173731d5654afe0addf857270e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

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

@ -4627,7 +4627,8 @@ Type_case_clauses::Type_case_clause::traverse(Traverse* traverse)
// statements.
void
Type_case_clauses::Type_case_clause::lower(Type* switch_val_type,
Type_case_clauses::Type_case_clause::lower(Gogo* gogo,
Type* switch_val_type,
Block* b,
Temporary_statement* descriptor_temp,
Unnamed_label* break_label,
@ -4666,9 +4667,16 @@ Type_case_clauses::Type_case_clause::lower(Type* switch_val_type,
Expression::make_nil(loc),
loc);
else if (type->interface_type() == NULL)
cond = Expression::make_binary(OPERATOR_EQEQ, ref,
Expression::make_type_descriptor(type, loc),
loc);
{
if (!gogo->need_eqtype())
cond = Expression::make_binary(OPERATOR_EQEQ, ref,
Expression::make_type_descriptor(type, loc),
loc);
else
cond = Runtime::make_call(Runtime::EQTYPE, loc, 2,
Expression::make_type_descriptor(type, loc),
ref);
}
else
cond = Runtime::make_call(Runtime::IFACET2IP, loc, 2,
Expression::make_type_descriptor(type, loc),
@ -4826,7 +4834,8 @@ Type_case_clauses::check_duplicates() const
// BREAK_LABEL is the label at the end of the type switch.
void
Type_case_clauses::lower(Type* switch_val_type, Block* b,
Type_case_clauses::lower(Gogo* gogo, Type* switch_val_type,
Block* b,
Temporary_statement* descriptor_temp,
Unnamed_label* break_label) const
{
@ -4838,7 +4847,7 @@ Type_case_clauses::lower(Type* switch_val_type, Block* b,
++p)
{
if (!p->is_default())
p->lower(switch_val_type, b, descriptor_temp, break_label,
p->lower(gogo, switch_val_type, b, descriptor_temp, break_label,
&stmts_label);
else
{
@ -4850,7 +4859,7 @@ Type_case_clauses::lower(Type* switch_val_type, Block* b,
go_assert(stmts_label == NULL);
if (default_case != NULL)
default_case->lower(switch_val_type, b, descriptor_temp, break_label,
default_case->lower(gogo, switch_val_type, b, descriptor_temp, break_label,
NULL);
}
@ -4905,7 +4914,7 @@ Type_switch_statement::do_traverse(Traverse* traverse)
// equality testing.
Statement*
Type_switch_statement::do_lower(Gogo*, Named_object*, Block* enclosing,
Type_switch_statement::do_lower(Gogo* gogo, Named_object*, Block* enclosing,
Statement_inserter*)
{
const Location loc = this->location();
@ -4943,7 +4952,7 @@ Type_switch_statement::do_lower(Gogo*, Named_object*, Block* enclosing,
b->add_statement(s);
if (this->clauses_ != NULL)
this->clauses_->lower(val_type, b, descriptor_temp, this->break_label());
this->clauses_->lower(gogo, val_type, b, descriptor_temp, this->break_label());
s = Statement::make_unnamed_label_statement(this->break_label_);
b->add_statement(s);

4
gcc/go/gofrontend/statements.h
View file

@ -2089,7 +2089,7 @@ class Type_case_clauses
// Lower to if and goto statements.
void
lower(Type*, Block*, Temporary_statement* descriptor_temp,
lower(Gogo*, Type*, Block*, Temporary_statement* descriptor_temp,
Unnamed_label* break_label) const;
// Return true if these clauses may fall through to the statements
@ -2138,7 +2138,7 @@ class Type_case_clauses
// Lower to if and goto statements.
void
lower(Type*, Block*, Temporary_statement* descriptor_temp,
lower(Gogo*, Type*, Block*, Temporary_statement* descriptor_temp,
Unnamed_label* break_label, Unnamed_label** stmts_label) const;
// Return true if this clause may fall through to execute the