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

go-gcc.cc (array_constructor_expression): Don't construct arrays of zero-sized values. 

* go-gcc.cc (array_constructor_expression): Don't construct arrays
	of zero-sized values.

From-SVN: r218974
This commit is contained in:
Chris Manghane 2014-12-19 20:17:42 +00:00 committed by Ian Lance Taylor
parent 82f84ecbb4
commit 943cf9cf62
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/go/ChangeLog
View File

@ -1,3 +1,8 @@
2014-12-19 Chris Manghane <cmang@google.com>
* go-gcc.cc (array_constructor_expression): Don't construct arrays
of zero-sized values.
2014-10-29 Richard Sandiford <richard.sandiford@arm.com> 2014-10-29 Richard Sandiford <richard.sandiford@arm.com>
* go-lang.c: Remove redundant enum from machine_mode. * go-lang.c: Remove redundant enum from machine_mode.

23
gcc/go/go-gcc.cc
View File

@ -1688,16 +1688,20 @@ Gcc_backend::constructor_expression(Btype* btype,
Bexpression* Bexpression*
Gcc_backend::array_constructor_expression( Gcc_backend::array_constructor_expression(
Btype* array_btype, const std::vector<unsigned long>& indexes, Btype* array_btype, const std::vector<unsigned long>& indexes,
const std::vector<Bexpression*>& vals, Location) const std::vector<Bexpression*>& vals, Location location)
{ {
tree type_tree = array_btype->get_tree(); tree type_tree = array_btype->get_tree();
if (type_tree == error_mark_node) if (type_tree == error_mark_node)
return this->error_expression(); return this->error_expression();
gcc_assert(indexes.size() == vals.size()); gcc_assert(indexes.size() == vals.size());
vec<constructor_elt, va_gc> *init;
vec_alloc(init, vals.size());
tree element_type = TREE_TYPE(type_tree);
HOST_WIDE_INT element_size = int_size_in_bytes(element_type);
vec<constructor_elt, va_gc> *init;
vec_alloc(init, element_size == 0 ? 0 : vals.size());
tree sink = NULL_TREE;
bool is_constant = true; bool is_constant = true;
for (size_t i = 0; i < vals.size(); ++i) for (size_t i = 0; i < vals.size(); ++i)
{ {
@ -1708,6 +1712,16 @@ Gcc_backend::array_constructor_expression(
|| val == error_mark_node) || val == error_mark_node)
return this->error_expression(); return this->error_expression();
if (element_size == 0)
{
// GIMPLE cannot represent arrays of zero-sized types so trying
// to construct an array of zero-sized values might lead to errors.
// Instead, we evaluate each expression that would have been added as
// an array value for its side-effects and construct an empty array.
append_to_statement_list(val, &sink);
continue;
}
if (!TREE_CONSTANT(val)) if (!TREE_CONSTANT(val))
is_constant = false; is_constant = false;
@ -1720,6 +1734,9 @@ Gcc_backend::array_constructor_expression(
tree ret = build_constructor(type_tree, init); tree ret = build_constructor(type_tree, init);
if (is_constant) if (is_constant)
TREE_CONSTANT(ret) = 1; TREE_CONSTANT(ret) = 1;
if (sink != NULL_TREE)
ret = fold_build2_loc(location.gcc_location(), COMPOUND_EXPR,
type_tree, sink, ret);
return this->make_expression(ret); return this->make_expression(ret);
} }