From: David Chase <drchase@google.com>
Date: Wed, 27 Mar 2019 20:15:04 +0000 (-0400)
Subject: cmd/compile: repair ssa/debug_test regression
X-Git-Tag: go1.13beta1~875
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=92e6cf4c0f9bf2e1ecd57f22a430d96020cbdd69;p=gostls13.git

cmd/compile: repair ssa/debug_test regression

Code introduced in

[2034fbab5b1d11bc59cb476bc3f49ee1b344839d]
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>
---

diff --git a/src/cmd/internal/src/pos.go b/src/cmd/internal/src/pos.go
index 8344a5a612..954c00716f 100644
--- a/src/cmd/internal/src/pos.go
+++ b/src/cmd/internal/src/pos.go
@@ -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))
 }