diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7586fd48f634..dbba68fb2605 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -08d221726e3f50cb197a931ba385fac67f66a028 +7a941ba323660ec7034cd92d4eab466024a3c72c The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 24f6b125c7d2..899fc9b4053e 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -12951,8 +12951,8 @@ Slice_construction_expression::do_flatten(Gogo* gogo, Named_object* no, // Base class flattening first this->Array_construction_expression::do_flatten(gogo, no, inserter); - // Create an stack-allocated storage temp if storage won't escape - if (!this->storage_escapes_) + // Create a stack-allocated storage temp if storage won't escape + if (!this->storage_escapes_ && this->slice_storage_ == NULL) { Location loc = this->location(); this->array_val_ = create_array_val();