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

re PR go/61264 (gccgo: ICE in __normal_iterator [GoSmith])

Browse Source 
PR go/61264
compiler: Fix copying behavior for empty composite literals.

From-SVN: r218789
This commit is contained in:
Ian Lance Taylor 2014-12-16 19:14:54 +00:00
parent 8c54c36bdf
commit 6a85804bf7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11588,7 +11588,10 @@ class Struct_construction_expression : public Expression
do_copy()
{
Struct_construction_expression* ret =
new Struct_construction_expression(this->type_, this->vals_->copy(),
new Struct_construction_expression(this->type_,
(this->vals_ == NULL
? NULL
: this->vals_->copy()),
this->location());
if (this->traverse_order_ != NULL)
ret->set_traverse_order(this->traverse_order_);
@ -12353,7 +12356,10 @@ class Map_construction_expression : public Expression
Expression*
do_copy()
{
return new Map_construction_expression(this->type_, this->vals_->copy(),
return new Map_construction_expression(this->type_,
(this->vals_ == NULL
? NULL
: this->vals_->copy()),
this->location());
}