diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-22 22:12:50 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-22 22:12:50 +0000 |
| commit | c8a0d1c344a6da9bbe6c0bad34dd3d12fe11d0df (patch) | |
| tree | a8fe1a066a913854c0f793fe0ba500003b56dc84 | |
| parent | b34391e08e273b5dbdce966518c6d7be0596bd16 (diff) | |
| download | gcc-c8a0d1c344a6da9bbe6c0bad34dd3d12fe11d0df.zip gcc-c8a0d1c344a6da9bbe6c0bad34dd3d12fe11d0df.tar.gz gcc-c8a0d1c344a6da9bbe6c0bad34dd3d12fe11d0df.tar.bz2 | |
runtime: uncomment check for gchelper on g0 stack
Now that systemstack changes to the g0 stack, this check passes.
Reviewed-on: https://go-review.googlesource.com/46460
From-SVN: r249578
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/mgc.go | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3f42df6..b6037a6 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c5aa42107d116c9121de447d214297c88dd9f5fa +385efb8947af70b8425c833a1ab68ba5f357dfae The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/mgc.go b/libgo/go/runtime/mgc.go index ebb00e1..a4fc2be 100644 --- a/libgo/go/runtime/mgc.go +++ b/libgo/go/runtime/mgc.go @@ -1923,10 +1923,9 @@ func gchelperstart() { if _g_.m.helpgc < 0 || _g_.m.helpgc >= _MaxGcproc { throw("gchelperstart: bad m->helpgc") } - // For gccgo we run gchelper on the normal g stack. - // if _g_ != _g_.m.g0 { - // throw("gchelper not running on g0 stack") - // } + if _g_ != _g_.m.g0 { + throw("gchelper not running on g0 stack") + } } // itoaDiv formats val/(10**dec) into buf. |