From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 16 Oct 2014 18:57:14 +0000 (+0000)
Subject: compiler: Check for initialization cycles in bound method expressions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6e31dffc122fc91ca33a9b43ab8b5051585b979;p=gcc.git

compiler: Check for initialization cycles in bound method expressions.

Fixes issue 7961.

From-SVN: r216342
---

diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 4c7eca4b247..02a980607fe 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -953,13 +953,14 @@ Find_var::expression(Expression** pexpr)
 	}
     }
 
-  // We traverse the code of any function we see.  Note that this
-  // means that we will traverse the code of a function whose address
-  // is taken even if it is not called.
+  // We traverse the code of any function or bound method we see.  Note that
+  // this means that we will traverse the code of a function or bound method
+  // whose address is taken even if it is not called.
   Func_expression* fe = e->func_expression();
-  if (fe != NULL)
+  Bound_method_expression* bme = e->bound_method_expression();
+  if (fe != NULL || bme != NULL)
     {
-      const Named_object* f = fe->named_object();
+      const Named_object* f = fe != NULL ? fe->named_object() : bme->function();
       if (f->is_function() && f->package() == NULL)
 	{
 	  std::pair<Seen_objects::iterator, bool> ins =