diff options
| -rw-r--r-- | gcc/go/gofrontend/gogo.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index 4c7eca4b..02a9806 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 = |