1a1fba1e25779247a4969789885ce80b7b4a2359 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 28683d6852b..d31fb336e41 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -06ada1f2ab9b05e54641438db28c557c6900b2a3 +75b08794cb1485c955d13784c53a89174764af55 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc index c93d82bba39..d7410588347 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -4932,7 +4932,7 @@ Parse::type_switch_body(Label* label, const Type_switch& type_switch, } Type_switch_statement* statement = - Statement::make_type_switch_statement(var_name, init, location); + Statement::make_type_switch_statement(init, location); this->push_break_statement(statement, label); Type_case_clauses* case_clauses = new Type_case_clauses(); diff --git a/gcc/go/gofrontend/statements.cc b/gcc/go/gofrontend/statements.cc index 33b568e3eeb..b43f1393e33 100644 --- a/gcc/go/gofrontend/statements.cc +++ b/gcc/go/gofrontend/statements.cc @@ -5046,8 +5046,6 @@ Type_switch_statement::do_dump_statement(Ast_dump_context* ast_dump_context) { ast_dump_context->print_indent(); ast_dump_context->ostream() << "switch "; - if (!this->name_.empty()) - ast_dump_context->ostream() << this->name_ << " = "; ast_dump_context->dump_expression(this->expr_); ast_dump_context->ostream() << " .(type)"; if (ast_dump_context->dump_subblocks()) @@ -5062,10 +5060,9 @@ Type_switch_statement::do_dump_statement(Ast_dump_context* ast_dump_context) // Make a type switch statement. Type_switch_statement* -Statement::make_type_switch_statement(const std::string& name, Expression* expr, - Location location) +Statement::make_type_switch_statement(Expression* expr, Location location) { - return new Type_switch_statement(name, expr, location); + return new Type_switch_statement(expr, location); } // Class Send_statement. diff --git a/gcc/go/gofrontend/statements.h b/gcc/go/gofrontend/statements.h index eb795c4b920..9ef63cb9a61 100644 --- a/gcc/go/gofrontend/statements.h +++ b/gcc/go/gofrontend/statements.h @@ -253,7 +253,7 @@ class Statement // Make a type switch statement. static Type_switch_statement* - make_type_switch_statement(const std::string&, Expression*, Location); + make_type_switch_statement(Expression*, Location); // Make a send statement. static Send_statement* @@ -2191,10 +2191,9 @@ class Type_case_clauses class Type_switch_statement : public Statement { public: - Type_switch_statement(const std::string& name, Expression* expr, - Location location) + Type_switch_statement(Expression* expr, Location location) : Statement(STATEMENT_TYPE_SWITCH, location), - name_(name), expr_(expr), clauses_(NULL), break_label_(NULL) + expr_(expr), clauses_(NULL), break_label_(NULL) { } // Add the clauses. @@ -2227,10 +2226,7 @@ class Type_switch_statement : public Statement do_may_fall_through() const; private: - // The name of the variable declared in the type switch guard. Empty if there - // is no variable declared. - std::string name_; - // The expression we are switching on if there is no variable. + // The expression we are switching on. Expression* expr_; // The type case clauses. Type_case_clauses* clauses_;