diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-09-20 03:42:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-09-20 03:42:56 +0000 |
| commit | e91ee0faa811b6cae44d146aa16c379797ad191e (patch) | |
| tree | 794215d28861c475d4faa92a4ee00bf5ca51f43e /libgo | |
| parent | d2b4864f55092b342dae9f2d147939f7ce08dfdc (diff) | |
| parent | 8fca13953b551bb75af0a31d737a297de97676a7 (diff) | |
| download | gcc-e91ee0faa811b6cae44d146aa16c379797ad191e.zip gcc-e91ee0faa811b6cae44d146aa16c379797ad191e.tar.gz gcc-e91ee0faa811b6cae44d146aa16c379797ad191e.tar.bz2 | |
Merge from trunk revision 252991.
From-SVN: r252993
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/runtime/testdata/testprogcgo/numgoroutine.go | 1 | ||||
| -rw-r--r-- | libgo/go/runtime/traceback_gccgo.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libgo/go/runtime/testdata/testprogcgo/numgoroutine.go b/libgo/go/runtime/testdata/testprogcgo/numgoroutine.go index 12fda49..68f1738 100644 --- a/libgo/go/runtime/testdata/testprogcgo/numgoroutine.go +++ b/libgo/go/runtime/testdata/testprogcgo/numgoroutine.go @@ -75,6 +75,7 @@ func checkNumGoroutine(label string, want int) (string, bool) { sbuf := make([]byte, 32<<10) sbuf = sbuf[:runtime.Stack(sbuf, true)] n = strings.Count(string(sbuf), "goroutine ") + n -= strings.Count(string(sbuf), "goroutine in C code") if n != want { fmt.Printf("%s Stack: want %d; got %d:\n%s\n", label, want, n, string(sbuf)) return "", false diff --git a/libgo/go/runtime/traceback_gccgo.go b/libgo/go/runtime/traceback_gccgo.go index f29ccd7..37c5698 100644 --- a/libgo/go/runtime/traceback_gccgo.go +++ b/libgo/go/runtime/traceback_gccgo.go @@ -216,7 +216,7 @@ func tracebackothers(me *g) { print("\tgoroutine running on other thread; stack unavailable\n") printcreatedby(gp) } else if readgstatus(gp)&^_Gscan == _Gsyscall { - print("\tin C code; stack unavailable\n") + print("\tgoroutine in C code; stack unavailable\n") printcreatedby(gp) } else { gp.traceback = &tb |