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

compiler: Compare slice start and end with cap, not len. 

From-SVN: r183851
This commit is contained in:
Ian Lance Taylor 2012-02-02 22:23:10 +00:00
parent 7de7ae1841
commit b6422b3755
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10649,11 +10649,28 @@ Array_index_expression::do_get_tree(Translate_context* context)
if (array_type->length() == NULL && !DECL_P(array_tree))
array_tree = save_expr(array_tree);
tree length_tree = array_type->length_tree(gogo, array_tree);
if (length_tree == error_mark_node)
return error_mark_node;
length_tree = save_expr(length_tree);
tree length_type = TREE_TYPE(length_tree);
tree length_tree = NULL_TREE;
if (this->end_ == NULL || this->end_->is_nil_expression())
{
length_tree = array_type->length_tree(gogo, array_tree);
if (length_tree == error_mark_node)
return error_mark_node;
length_tree = save_expr(length_tree);
}
tree capacity_tree = NULL_TREE;
if (this->end_ != NULL)
{
capacity_tree = array_type->capacity_tree(gogo, array_tree);
if (capacity_tree == error_mark_node)
return error_mark_node;
capacity_tree = save_expr(capacity_tree);
}
tree length_type = (length_tree != NULL_TREE
? TREE_TYPE(length_tree)
: TREE_TYPE(capacity_tree));
tree bad_index = boolean_false_node;
@ -10676,7 +10693,9 @@ Array_index_expression::do_get_tree(Translate_context* context)
? GE_EXPR
: GT_EXPR),
boolean_type_node, start_tree,
length_tree));
(this->end_ == NULL
? length_tree
: capacity_tree)));
int code = (array_type->length() != NULL
? (this->end_ == NULL
@ -10723,12 +10742,6 @@ Array_index_expression::do_get_tree(Translate_context* context)
// Array slice.
tree capacity_tree = array_type->capacity_tree(gogo, array_tree);
if (capacity_tree == error_mark_node)
return error_mark_node;
capacity_tree = fold_convert_loc(loc.gcc_location(), length_type,
capacity_tree);
tree end_tree;
if (this->end_->is_nil_expression())
end_tree = length_tree;
@ -10747,7 +10760,6 @@ Array_index_expression::do_get_tree(Translate_context* context)
end_tree = fold_convert_loc(loc.gcc_location(), length_type, end_tree);
capacity_tree = save_expr(capacity_tree);
tree bad_end = fold_build2_loc(loc.gcc_location(), TRUTH_OR_EXPR,
boolean_type_node,
fold_build2_loc(loc.gcc_location(),

3
gcc/go/gofrontend/types.cc
View File

@ -5416,7 +5416,8 @@ tree
Array_type::capacity_tree(Gogo* gogo, tree array)
{
if (this->length_ != NULL)
return omit_one_operand(sizetype, this->get_length_tree(gogo), array);
return omit_one_operand(integer_type_node, this->get_length_tree(gogo),
array);
// This is an open array. We need to read the capacity field.