From 350733e3886c9b5474b7232e96442469523b6b8c Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 28 Mar 2012 22:21:57 +0000
Subject: [PATCH] compiler: fix method finalization of unnamed structs.
Used to trigger an ICE on
var v struct{I}; type I interface{}
Updates issue 7.
From-SVN: r185931
---
gcc/go/gofrontend/gogo.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 5fe5aead9c0a..ee68b69cc976 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -1653,8 +1653,12 @@ Finalize_methods::type(Type* t)
}
case Type::TYPE_STRUCT:
+ // Traverse the field types first in case there is an embedded
+ // field with methods that the struct should inherit.
+ if (t->struct_type()->traverse_field_types(this) == TRAVERSE_EXIT)
+ return TRAVERSE_EXIT;
t->struct_type()->finalize_methods(this->gogo_);
- break;
+ return TRAVERSE_SKIP_COMPONENTS;
default:
break;
--
GitLab