diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-03 06:54:41 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-03 06:54:41 +0000 |
| commit | 7446ae0380f58e026d7aa0108af91fd8c5712bbe (patch) | |
| tree | c9fbab9c042a0361d5e78a65eee1132843133999 /gcc/go | |
| parent | ba32660f7442301b9adfd81793b288a4c9d7c5a2 (diff) | |
| download | gcc-7446ae0380f58e026d7aa0108af91fd8c5712bbe.tar.gz | |
compiler, runtime: mark stub methods, ignore them in runtime.Caller.
This fixes the long-standing bug in which the testing package misreports
the file/line of an error.
Reviewed-on: https://go-review.googlesource.com/19179
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233098 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3fb2a3e0c87..4f095c4d3f2 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a408bef550251926c28673818db2c64302faac1d +c70e74c116d08c6f2e787551eb1366983815c032 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/types.cc b/gcc/go/gofrontend/types.cc index c43d0645a0f..0443281dd81 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -9632,13 +9632,14 @@ Type::build_stub_methods(Gogo* gogo, const Type* type, const Methods* methods, package = NULL; else package = type->named_type()->named_object()->package(); + std::string stub_name = name + "$stub"; Named_object* stub; if (package != NULL) - stub = Named_object::make_function_declaration(name, package, + stub = Named_object::make_function_declaration(stub_name, package, stub_type, location); else { - stub = gogo->start_function(name, stub_type, false, + stub = gogo->start_function(stub_name, stub_type, false, fntype->location()); Type::build_one_stub_method(gogo, m, buf, stub_params, fntype->is_varargs(), location); |