git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't try to build unary and binary expressions with invalid types. 

From-SVN: r167824
This commit is contained in:
Ian Lance Taylor 2010-12-14 23:34:14 +00:00
parent 5262c72ad4
commit 173fb2ff62
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gcc/go/gofrontend/expressions.cc
View File

@ -3824,29 +3824,28 @@ Unary_expression::do_determine_type(const Type_context* context)
void
Unary_expression::do_check_types(Gogo*)
{
Type* type = this->expr_->type();
if (type->is_error_type())
{
this->set_is_error();
return;
}
switch (this->op_)
{
case OPERATOR_PLUS:
case OPERATOR_MINUS:
{
Type* type = this->expr_->type();
if (type->integer_type() == NULL
&& type->float_type() == NULL
&& type->complex_type() == NULL
&& !type->is_error_type())
this->report_error(_("expected numeric type"));
}
if (type->integer_type() == NULL
&& type->float_type() == NULL
&& type->complex_type() == NULL)
this->report_error(_("expected numeric type"));
break;
case OPERATOR_NOT:
case OPERATOR_XOR:
{
Type* type = this->expr_->type();
if (type->integer_type() == NULL
&& !type->is_boolean_type()
&& !type->is_error_type())
this->report_error(_("expected integer or boolean type"));
}
if (type->integer_type() == NULL
&& !type->is_boolean_type())
this->report_error(_("expected integer or boolean type"));
break;
case OPERATOR_AND:
@ -3858,12 +3857,8 @@ Unary_expression::do_check_types(Gogo*)
case OPERATOR_MULT:
// Indirecting through a pointer.
{
Type* type = this->expr_->type();
if (type->points_to() == NULL
&& !type->is_error_type())
this->report_error(_("expected pointer"));
}
if (type->points_to() == NULL)
this->report_error(_("expected pointer"));
break;
default:
@ -5474,7 +5469,10 @@ Binary_expression::do_check_types(Gogo*)
Type* left_type = this->left_->type();
Type* right_type = this->right_->type();
if (left_type->is_error_type() || right_type->is_error_type())
return;
{
this->set_is_error();
return;
}
if (this->op_ == OPERATOR_EQEQ
|| this->op_ == OPERATOR_NOTEQ