diff options
| author | Lynn Boger <laboger@linux.vnet.ibm.com> | 2019-02-21 14:48:52 -0500 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-02-25 18:08:46 +0000 |
| commit | 2d3474043cd35ba06d3566df520e8550c479944f (patch) | |
| tree | 8d27eec87f2713f8be03323977485c4f08772c7f /src/cmd/compile/internal/arm | |
| parent | 73b803ee532173f64a5d3fb2cd0fbe789d49571e (diff) | |
| download | go-2d3474043cd35ba06d3566df520e8550c479944f.tar.gz go-2d3474043cd35ba06d3566df520e8550c479944f.zip | |
cmd/compile: call ginsnop, not ginsnop2 on ppc64le for mid-stack inlining tracebacks
A recent change to fix stacktraces for inlined functions
introduced a regression on ppc64le when compiling position
independent code. That happened because ginsnop2 was called for
the purpose of inserting a NOP to identify the location of
the inlined function, when ginsnop should have been used.
ginsnop2 is intended to be used before deferreturn to ensure
r2 is properly restored when compiling position independent code.
In some cases the location where r2 is loaded from might not be
initialized. If that happens and r2 is used to generate an address,
the result is likely a SEGV.
This fixes that problem.
Fixes #30283
Change-Id: If70ef27fc65ef31969712422306ac3a57adbd5b6
Reviewed-on: https://go-review.googlesource.com/c/163337
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Andrew Bonventre <andybons@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/arm')
| -rw-r--r-- | src/cmd/compile/internal/arm/galign.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/arm/galign.go b/src/cmd/compile/internal/arm/galign.go index 241edaf3a0..8469dbdd73 100644 --- a/src/cmd/compile/internal/arm/galign.go +++ b/src/cmd/compile/internal/arm/galign.go @@ -19,6 +19,7 @@ func Init(arch *gc.Arch) { arch.ZeroRange = zerorange arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop + arch.Ginsnopdefer = ginsnop arch.SSAMarkMoves = func(s *gc.SSAGenState, b *ssa.Block) {} arch.SSAGenValue = ssaGenValue |