diff options
| author | Ian Lance Taylor <iant@golang.org> | 2018-01-09 01:23:08 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-09 01:23:08 +0000 |
| commit | 1a2f01efa63036a5104f203a4789e682c0e0915d (patch) | |
| tree | 373e15778dc8295354584e1f86915ae493b604ff /libgo/runtime/go-callers.c | |
| parent | 8799df67f2dab88f9fda11739c501780a85575e2 (diff) | |
| download | gcc-1a2f01efa63036a5104f203a4789e682c0e0915d.zip gcc-1a2f01efa63036a5104f203a4789e682c0e0915d.tar.gz gcc-1a2f01efa63036a5104f203a4789e682c0e0915d.tar.bz2 | |
libgo: update to Go1.10beta1
Update the Go library to the 1.10beta1 release.
Requires a few changes to the compiler for modifications to the map
runtime code, and to handle some nowritebarrier cases in the runtime.
Reviewed-on: https://go-review.googlesource.com/86455
gotools/:
* Makefile.am (go_cmd_vet_files): New variable.
(go_cmd_buildid_files, go_cmd_test2json_files): New variables.
(s-zdefaultcc): Change from constants to functions.
(noinst_PROGRAMS): Add vet, buildid, and test2json.
(cgo$(EXEEXT)): Link against $(LIBGOTOOL).
(vet$(EXEEXT)): New target.
(buildid$(EXEEXT)): New target.
(test2json$(EXEEXT)): New target.
(install-exec-local): Install all $(noinst_PROGRAMS).
(uninstall-local): Uninstasll all $(noinst_PROGRAMS).
(check-go-tool): Depend on $(noinst_PROGRAMS). Copy down
objabi.go.
(check-runtime): Depend on $(noinst_PROGRAMS).
(check-cgo-test, check-carchive-test): Likewise.
(check-vet): New target.
(check): Depend on check-vet. Look at cmd_vet-testlog.
(.PHONY): Add check-vet.
* Makefile.in: Rebuild.
From-SVN: r256365
Diffstat (limited to 'libgo/runtime/go-callers.c')
| -rw-r--r-- | libgo/runtime/go-callers.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libgo/runtime/go-callers.c b/libgo/runtime/go-callers.c index 09def91..9f376c7 100644 --- a/libgo/runtime/go-callers.c +++ b/libgo/runtime/go-callers.c @@ -127,8 +127,12 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno, p = filename; if (__builtin_strcmp (p, "/proc.c") == 0) { - if (__builtin_strcmp (function, "kickoff") == 0 - || __builtin_strcmp (function, "runtime.mstart") == 0 + if (__builtin_strcmp (function, "runtime_mstart") == 0) + return 1; + } + else if (__builtin_strcmp (p, "/proc.go") == 0) + { + if (__builtin_strcmp (function, "runtime.kickoff") == 0 || __builtin_strcmp (function, "runtime.main") == 0) return 1; } @@ -184,6 +188,21 @@ runtime_callers (int32 skip, Location *locbuf, int32 m, bool keep_thunks) backtrace_full (__go_get_backtrace_state (), 0, callback, error_callback, &data); runtime_xadd (&runtime_in_callers, -1); + + /* For some reason GCC sometimes loses the name of a thunk function + at the top of the stack. If we are skipping thunks, skip that + one too. */ + if (!keep_thunks + && data.index > 2 + && locbuf[data.index - 2].function.len == 0 + && locbuf[data.index - 1].function.str != NULL + && __builtin_strcmp ((const char *) locbuf[data.index - 1].function.str, + "runtime.kickoff") == 0) + { + locbuf[data.index - 2] = locbuf[data.index - 1]; + --data.index; + } + return data.index; } |