diff options
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/runtime/proc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c index 4004df4..1569b5b 100644 --- a/libgo/runtime/proc.c +++ b/libgo/runtime/proc.c @@ -482,9 +482,14 @@ void doscanstackswitch(G*, G*) __asm__(GOSYM_PREFIX "runtime.doscanstackswitch") void doscanstackswitch(G* me, G* gp) { + M* holdm; + __go_assert(me->entry == nil); me->fromgogo = false; + holdm = gp->m; + gp->m = me->m; + #ifdef USING_SPLIT_STACK __splitstack_getcontext((void*)(&me->stackcontext[0])); #endif @@ -507,6 +512,8 @@ doscanstackswitch(G* me, G* gp) if (gp->scang != 0) runtime_gogo(gp); + + gp->m = holdm; } // Do a stack scan, then switch back to the g that triggers this scan. @@ -515,21 +522,15 @@ static void gscanstack(G *gp) { G *oldg, *oldcurg; - M* holdm; oldg = (G*)gp->scang; oldcurg = oldg->m->curg; - holdm = gp->m; - if(holdm != nil && holdm != g->m) - runtime_throw("gscanstack: m is not nil"); oldg->m->curg = gp; - gp->m = oldg->m; gp->scang = 0; doscanstack(gp, (void*)gp->scangcw); gp->scangcw = 0; - gp->m = holdm; oldg->m->curg = oldcurg; runtime_gogo(oldg); } |