diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f9d37e7..726bf3a 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d6338c94e5574b63469c740159d064e89c6718bf +38850073f25f9de4f3daa33d799def3a33c942ab 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 fa8c0ad..2fb6706 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -992,8 +992,10 @@ Type::get_backend(Gogo* gogo) return this->btype_; if (this->named_type() != NULL && this->named_type()->is_alias()) { - this->btype_ = this->unalias()->get_backend(gogo); - return this->btype_; + 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 |