diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-12-19 20:17:42 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-12-19 20:17:42 +0000 |
| commit | f932433f6acbef8b70cbbe184371db0a3ba56efc (patch) | |
| tree | ee367f74244d4fbd85ad50718a33ce496bb30439 /gcc/go | |
| parent | 78645e70cb52999c2bbc75495a1b378cebe2ef12 (diff) | |
* go-gcc.cc (array_constructor_expression): Don't construct arrays
of zero-sized values.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218974 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/go/go-gcc.cc | 21 |
2 files changed, 24 insertions, 2 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index dadced939f9..7df6cbfffd4 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -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> * go-lang.c: Remove redundant enum from machine_mode. diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc index 9aad6b07b5c..c1006303cb6 100644 --- a/gcc/go/go-gcc.cc +++ b/gcc/go/go-gcc.cc @@ -1688,16 +1688,20 @@ Gcc_backend::constructor_expression(Btype* btype, Bexpression* Gcc_backend::array_constructor_expression( 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(); if (type_tree == error_mark_node) return this->error_expression(); gcc_assert(indexes.size() == 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, vals.size()); + vec_alloc(init, element_size == 0 ? 0 : vals.size()); + tree sink = NULL_TREE; bool is_constant = true; for (size_t i = 0; i < vals.size(); ++i) { @@ -1708,6 +1712,16 @@ Gcc_backend::array_constructor_expression( || val == error_mark_node) 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)) is_constant = false; @@ -1720,6 +1734,9 @@ Gcc_backend::array_constructor_expression( tree ret = build_constructor(type_tree, init); if (is_constant) 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); } |