mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-13 21:01:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

compiler: Correct type of expressions involving character constants.

Browse Source 
From-SVN: r183490
This commit is contained in:
Ian Lance Taylor 2012-01-24 19:33:52 +00:00
parent 2c49569ece
commit fd9df055b2
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5556,7 +5556,9 @@ Binary_expression::do_lower(Gogo* gogo, Named_object*,
Expression* ret = NULL;
if (left_type != right_type
&& left_type != NULL
&& !left_type->is_abstract()
&& right_type != NULL
&& !right_type->is_abstract()
&& left_type->base() != right_type->base()
&& op != OPERATOR_LSHIFT
&& op != OPERATOR_RSHIFT)
@ -5608,7 +5610,27 @@ Binary_expression::do_lower(Gogo* gogo, Named_object*,
type = right_type;
else
type = left_type;
ret = Expression::make_integer(&val, type, location);
bool is_character = false;
if (type == NULL)
{
Type* t = this->left_->type();
if (t->integer_type() != NULL
&& t->integer_type()->is_rune())
is_character = true;
else if (op != OPERATOR_LSHIFT && op != OPERATOR_RSHIFT)
{
t = this->right_->type();
if (t->integer_type() != NULL
&& t->integer_type()->is_rune())
is_character = true;
}
}
if (is_character)
ret = Expression::make_character(&val, type, location);
else
ret = Expression::make_integer(&val, type, location);
}
mpz_clear(val);
@ -6252,6 +6274,12 @@ Binary_expression::do_type()
return left_type;
else if (right_type->float_type() != NULL)
return right_type;
else if (left_type->integer_type() != NULL
&& left_type->integer_type()->is_rune())
return left_type;
else if (right_type->integer_type() != NULL
&& right_type->integer_type()->is_rune())
return right_type;
else
return left_type;
}