diff options
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/gogo.cc | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 257ca95..a893731 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2f7ac42a3f83b78d97912ce1e86296b2af4f52b7 +0c8c4fca4b52bc2323561a432436af5343e0f7b4 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/gogo.cc b/gcc/go/gofrontend/gogo.cc index 04edb08..ab0c27b 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -6199,9 +6199,15 @@ Bindings_snapshot::check_goto_defs(Location loc, const Block* block, } go_assert(p != block->bindings()->end_definitions()); - std::string n = (*p)->message_name(); - go_error_at(loc, "goto jumps over declaration of %qs", n.c_str()); - go_inform((*p)->location(), "%qs defined here", n.c_str()); + for (; p != block->bindings()->end_definitions(); ++p) + { + if ((*p)->is_variable()) + { + std::string n = (*p)->message_name(); + go_error_at(loc, "goto jumps over declaration of %qs", n.c_str()); + go_inform((*p)->location(), "%qs defined here", n.c_str()); + } + } } } |