From a2c76d48b566cbf71672ce4681b9b873d4dd9b13 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 16 Dec 2010 02:24:10 +0000 Subject: [PATCH] Rework handling of recursive function types. From-SVN: r167898 --- gcc/go/gofrontend/types.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index bd0c7e5a58c..af541e8eb51 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -6887,11 +6887,17 @@ Named_type::do_get_tree(Gogo* gogo) break; case TYPE_FUNCTION: - // Don't recur infinitely if a function type refers to itself. - // Ideally we would build a circular data structure here, but - // GENERIC can't handle them. + // GENERIC can't handle a pointer to a function type whose + // return type is a pointer to the function type itself. It + // does into infinite loops when walking the types. if (this->seen_) - return ptr_type_node; + { + Function_type* fntype = this->type_->function_type(); + if (fntype->results() != NULL + && fntype->results()->size() == 1 + && fntype->results()->front().type()->forwarded() == this) + return ptr_type_node; + } this->seen_ = true; t = Type::get_named_type_tree(gogo, this->type_); this->seen_ = false; -- 2.11.4.GIT