diff options
| author | Keith Randall <khr@golang.org> | 2025-11-05 18:05:42 -0800 |
|---|---|---|
| committer | David Chase <drchase@google.com> | 2025-11-06 05:00:27 -0800 |
| commit | 48c7fa13c63761c8b52cbfac1f9eab062d475c0c (patch) | |
| tree | 14eca1749ddb9132aa3153054841d5037154396d /src/cmd/compile | |
| parent | 8111104a2120e14ef068b9cfbda91965473ab345 (diff) | |
| download | go-48c7fa13c63761c8b52cbfac1f9eab062d475c0c.tar.xz | |
Revert "runtime: remove the pc field of _defer struct"
This reverts commit 361d51a6b58bccaab0559e06737c918018a7a5fa.
Reason for revert: Breaks some tests inside Google (on arm64?)
Change-Id: Iaea45fdcf9b4f9d36553687ca7f479750fe559da
Reviewed-on: https://go-review.googlesource.com/c/go/+/718066
Auto-Submit: Keith Randall <khr@golang.org>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Youlin Feng <fengyoulin@live.com>
Reviewed-by: Keith Randall <khr@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src/cmd/compile')
| -rw-r--r-- | src/cmd/compile/internal/ssagen/ssa.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go index db2ffb5752..ae7d57566f 100644 --- a/src/cmd/compile/internal/ssagen/ssa.go +++ b/src/cmd/compile/internal/ssagen/ssa.go @@ -7797,7 +7797,7 @@ func callTargetLSym(callee *ir.Name) *obj.LSym { } // deferStructFnField is the field index of _defer.fn. -const deferStructFnField = 3 +const deferStructFnField = 4 var deferType *types.Type @@ -7817,6 +7817,7 @@ func deferstruct() *types.Type { makefield("heap", types.Types[types.TBOOL]), makefield("rangefunc", types.Types[types.TBOOL]), makefield("sp", types.Types[types.TUINTPTR]), + makefield("pc", types.Types[types.TUINTPTR]), // Note: the types here don't really matter. Defer structures // are always scanned explicitly during stack copying and GC, // so we make them uintptr type even though they are real pointers. |