aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-07-29 15:15:03 -0400
committerRuss Cox <rsc@golang.org>2015-07-29 21:37:12 +0000
commit034a10d44c8f83d2c36ab4e242c14e9744c54949 (patch)
tree052b319ed96a465814d80397f89ffa74b14cb071 /src
parent767e065809937229767bb3496fdce61b74b815e1 (diff)
downloadgo-034a10d44c8f83d2c36ab4e242c14e9744c54949.tar.xz
cmd/internal/obj/arm64: reject misaligned stack frames, except empty frames
The layout code has to date insisted on stack frames that are 16-aligned including the saved LR, and it ensured this by growing the frame itself. This breaks code that refers to values near the top of the frame by positive offset from SP, and in general it's too magical: if you see TEXT xxx, $N, you expect that the frame size is actually N, not sometimes N and sometimes N+8. This led to a serious bug in the compiler where ambiguously live values were not being zeroed correctly, which in turn triggered an assertion in the GC about finding only valid pointers. The compiler has been fixed to always emit aligned frames, and the hand-written assembly has also been fixed. Now that everything is aligned, make unaligned an error instead of something to "fix" silently. For #9880. Change-Id: I05f01a9df174d64b37fa19b36a6b6c5f18d5ba2d Reviewed-on: https://go-review.googlesource.com/12848 Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/internal/obj/arm64/obj7.go18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/cmd/internal/obj/arm64/obj7.go b/src/cmd/internal/obj/arm64/obj7.go
index 77117fb530..da6edd1740 100644
--- a/src/cmd/internal/obj/arm64/obj7.go
+++ b/src/cmd/internal/obj/arm64/obj7.go
@@ -553,7 +553,6 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
var o int
var q2 *obj.Prog
var retjmp *obj.LSym
- var stkadj int64
for p := cursym.Text; p != nil; p = p.Link {
o = int(p.As)
switch o {
@@ -567,9 +566,20 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
if (cursym.Text.Mark&LEAF != 0) && ctxt.Autosize <= 8 {
ctxt.Autosize = 0
} else if ctxt.Autosize&(16-1) != 0 {
- stkadj = 16 - (int64(ctxt.Autosize) & (16 - 1))
- ctxt.Autosize += int32(stkadj)
- cursym.Locals += int32(stkadj)
+ // The frame includes an LR.
+ // If the frame size is 8, it's only an LR,
+ // so there's no potential for breaking references to
+ // local variables by growing the frame size,
+ // because there are no local variables.
+ // But otherwise, if there is a non-empty locals section,
+ // the author of the code is responsible for making sure
+ // that the frame size is 8 mod 16.
+ if ctxt.Autosize == 8 {
+ ctxt.Autosize += 8
+ ctxt.Locals += 8
+ } else {
+ ctxt.Diag("%v: unaligned frame size %d - must be 8 mod 16 (or 0)", p, ctxt.Autosize-8)
+ }
}
p.To.Offset = int64(ctxt.Autosize) - 8
if ctxt.Autosize == 0 && !(cursym.Text.Mark&LEAF != 0) {