From b03f1d1a7e1c84d1fa7e4bcf8c705dfeb1a4565d Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Sun, 24 Sep 2017 10:48:18 -0400 Subject: [PATCH] runtime: remove extraneous stackPreempt setting The stackguard is set to stackPreempt earlier in reentersyscall, and as it comes with throwsplit = true there's no way for the stackguard to be set to anything else by the end of reentersyscall. Change-Id: I4e942005b22ac784c52398c74093ac887fc8ec24 Reviewed-on: https://go-review.googlesource.com/65673 Run-TryBot: David Crawshaw TryBot-Result: Gobot Gobot Reviewed-by: Austin Clements --- src/runtime/proc.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 2e958f7fc5..f20e77eee5 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -2824,10 +2824,6 @@ func reentersyscall(pc, sp uintptr) { save(pc, sp) } - // Goroutines must not split stacks in Gsyscall status (it would corrupt g->sched). - // We set _StackGuard to StackPreempt so that first split stack check calls morestack. - // Morestack detects this case and throws. - _g_.stackguard0 = stackPreempt _g_.m.locks-- }