1
0
mirror of https://github.com/golang/go synced 2024-11-24 04:40:24 -07:00

cmd/compile: repair ssa/debug_test regression

Code introduced in

[2034fbab5b]
cmd/compile: use existing instructions instead of nops for inline marks

to change a src.Pos's column to 1 accidentally reset
the is_stmt and prologue/epilogue bits, and that
turned out to cause a regression in ssa/debug_test.

Preserving that information fixed the regression.

Change-Id: I7c6859c8b68d9c6f7c0cbc8805c1f41dc5c1d5fb
Reviewed-on: https://go-review.googlesource.com/c/go/+/169739
Run-TryBot: David Chase <drchase@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
This commit is contained in:
David Chase 2019-03-27 16:15:04 -04:00
parent 4dce6dbb1e
commit 92e6cf4c0f

View File

@ -311,7 +311,9 @@ const (
colBits, colMax = 32 - lineBits - xlogueBits - isStmtBits, 1<<colBits - 1
isStmtShift = 0
isStmtMask = isStmtMax << isStmtShift
xlogueShift = isStmtBits + isStmtShift
xlogueMask = xlogueMax << xlogueShift
colShift = xlogueBits + xlogueShift
lineShift = colBits + colShift
)
@ -443,5 +445,5 @@ func (x lico) lineNumberHTML() string {
}
func (x lico) atColumn1() lico {
return makeLico(x.Line(), 1)
return makeLico(x.Line(), 1) | (x & (isStmtMask | xlogueMask))
}