diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 330c458ec8c6f5879b03973da530e6b31a31de97..574d33d95bcd5cdad4c21f7128439bbb3f3a8c84 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d81ff42c367cce2110ccf5ddbadb6cc9bdf94e28 +d1fa6c34e56eade6fb5b6291f0a727b1a12bf6f1 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/types.cc b/gcc/go/gofrontend/types.cc index 0ada84106f9ba5c263a9601b2b21c2b21b3d6f12..eeae9fa4c0e924eef4a6056b652b58594b45a9cb 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -965,12 +965,13 @@ Type::get_backend(Gogo* gogo) if (this->btype_ != NULL) return this->btype_; - if (this->named_type() != NULL && this->named_type()->is_alias()) { - Btype* bt = this->unalias()->get_backend(gogo); - if (gogo != NULL && gogo->named_types_are_converted()) - this->btype_ = bt; - return bt; - } + if (this->named_type() != NULL && this->named_type()->is_alias()) + { + Btype* bt = this->unalias()->get_backend(gogo); + if (gogo != NULL && gogo->named_types_are_converted()) + this->btype_ = bt; + return bt; + } if (this->forward_declaration_type() != NULL || this->named_type() != NULL)