OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR go/61308 (gccgo: ICE in Expression::check_bounds [GoSmith])

Browse Source 
PR go/61308

compiler: Convert array start index before bounds checking.

From-SVN: r212372
This commit is contained in:
Ian Lance Taylor 2014-07-08 21:28:17 +00:00
parent 0630a48fdf
commit fd4de8b2be
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10218,7 +10218,8 @@ Array_index_expression::do_get_backend(Translate_context* context)
Location loc = this->location();
Gogo* gogo = context->gogo();
Btype* int_btype = Type::lookup_integer_type("int")->get_backend(gogo);
Type* int_type = Type::lookup_integer_type("int");
Btype* int_btype = int_type->get_backend(gogo);
// We need to convert the length and capacity to the Go "int" type here
// because the length of a fixed-length array could be of type "uintptr"
@ -10259,8 +10260,15 @@ Array_index_expression::do_get_backend(Translate_context* context)
: RUNTIME_ERROR_SLICE_SLICE_OUT_OF_BOUNDS));
Bexpression* crash = gogo->runtime_error(code, loc)->get_backend(context);
if (this->start_->type()->integer_type() == NULL
&& !Type::are_convertible(int_type, this->start_->type(), NULL))
{
go_assert(saw_errors());
return context->backend()->error_expression();
}
Expression* start_expr = Expression::make_cast(int_type, this->start_, loc);
Bexpression* bad_index =
Expression::check_bounds(this->start_, loc)->get_backend(context);
Expression::check_bounds(start_expr, loc)->get_backend(context);
Bexpression* start = this->start_->get_backend(context);
start = gogo->backend()->convert_expression(int_btype, start, loc);