compiler: call runtime.eqtype for non-interface type switch on aix
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
Change-Id: Ic06d95081e837122c409a2aba377d1afae676342
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/255202
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Cherry Zhang <cherryyz@google.com>
diff --git a/go/statements.cc b/go/statements.cc
index a059ee4..ad89807 100644
--- a/go/statements.cc
+++ b/go/statements.cc
@@ -4627,7 +4627,8 @@
// 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 @@
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 @@
// 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 @@
++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 @@
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 @@
// 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 @@
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);
diff --git a/go/statements.h b/go/statements.h
index f1c6be9..47092b4 100644
--- a/go/statements.h
+++ b/go/statements.h
@@ -2089,7 +2089,7 @@
// 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 @@
// 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
