diff options
Diffstat (limited to 'src/runtime/stack.go')
| -rw-r--r-- | src/runtime/stack.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/runtime/stack.go b/src/runtime/stack.go index 6149838b6d..1bfd9dd27f 100644 --- a/src/runtime/stack.go +++ b/src/runtime/stack.go @@ -619,7 +619,7 @@ func adjustframe(frame *stkframe, arg unsafe.Pointer) bool { if stackDebug >= 2 { print(" adjusting ", funcname(f), " frame=[", hex(frame.sp), ",", hex(frame.fp), "] pc=", hex(frame.pc), " continpc=", hex(frame.continpc), "\n") } - if f.entry == systemstack_switchPC { + if f.funcID == funcID_systemstack_switch { // A special routine at the bottom of stack of a goroutine that does an systemstack call. // We will allow it to be copied even though we don't // have full GC info for it (because it is written in asm). @@ -1110,7 +1110,8 @@ func shrinkstack(gp *g) { if debug.gcshrinkstackoff > 0 { return } - if gp.startpc == gcBgMarkWorkerPC { + f := findfunc(gp.startpc) + if f.valid() && f.funcID == funcID_gcBgMarkWorker { // We're not allowed to shrink the gcBgMarkWorker // stack (see gcBgMarkWorker for explanation). return |