From 6f6c6c5782a0e4e7448d10a98b417e8479a780ee Mon Sep 17 00:00:00 2001
From: Keith Randall <khr@golang.org>
Date: Tue, 1 Jul 2025 15:00:13 -0700
Subject: cmd/internal/obj: rip out argp adjustment for wrapper frames

The previous CL made this adjustment unnecessary. The argp field
is no longer used by the runtime.

Change-Id: I3491eeef4103c6653ec345d604c0acd290af9e8f
Reviewed-on: https://go-review.googlesource.com/c/go/+/685356
Reviewed-by: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
---
 src/runtime/panic.go | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/runtime/panic.go')

diff --git a/src/runtime/panic.go b/src/runtime/panic.go
index ebb6405c3d..1e61c90aef 100644
--- a/src/runtime/panic.go
+++ b/src/runtime/panic.go
@@ -959,10 +959,6 @@ func (p *_panic) nextDefer() (func(), bool) {
 		}
 	}
 
-	// The assembler adjusts p.argp in wrapper functions that shouldn't
-	// be visible to recover(), so we need to restore it each iteration.
-	p.argp = add(p.startSP, sys.MinFrameSize)
-
 	for {
 		for p.deferBitsPtr != nil {
 			bits := *p.deferBitsPtr
-- 
cgit v1.3-5-g9baa