From 47e6fd05f7d605774864984f70e5a93355109a61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Geisend=C3=B6rfer?= Date: Wed, 26 Apr 2023 10:02:22 +0200 Subject: [PATCH] runtime: remove systemstack logic from adjustframe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove logic for skipping some adjustframe logic for systemstack (aka FuncID_systemstack_switch). This was introduced in 2014 by 9198ed4bd6ec7b7dd37aa2797e96f15ddbb1e6cd but doesn't seem to be needed anymore. Updates #59692 Change-Id: I2368d64f9bb28ced4e7f15c9b15dac7a29194389 Reviewed-on: https://go-review.googlesource.com/c/go/+/489116 Reviewed-by: Michael Knyszek TryBot-Result: Gopher Robot Run-TryBot: Felix Geisendörfer Reviewed-by: Cherry Mui --- src/runtime/stack.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/runtime/stack.go b/src/runtime/stack.go index 01d6b9c22f..45d66da91f 100644 --- a/src/runtime/stack.go +++ b/src/runtime/stack.go @@ -676,13 +676,6 @@ func adjustframe(frame *stkframe, adjinfo *adjustinfo) { adjustpointer(adjinfo, unsafe.Pointer(frame.varp)) } - if f.funcID == abi.FuncID_systemstack_switch { - // A special routine at the bottom of stack of a goroutine that does a 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). - return - } - locals, args, objs := frame.getStackMap(&adjinfo.cache, true) // Adjust local variables if stack frame has been allocated. -- 2.50.0