Skip to content

Commit

Permalink
cmd/compile: fix debug info generation for loads from Phis
Browse files Browse the repository at this point in the history
Apparently a LoadReg can take a Phi as its argument. The Phi has names
in the NamedValue table, so just read the Load's names from the Phi.

The example given, XORKeyStream in chacha20, is pretty complicated so I
didn't try to actually debug it and verify that the results are right.
But the debug logging looks reasonable, with the right names in the right
registers at the right times.

Fixes #25404

Change-Id: I2c3183dcfb033948556d6805bd66c22c0b45625c
Reviewed-on: https://go-review.googlesource.com/114008
Run-TryBot: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
  • Loading branch information
heschi committed May 23, 2018
1 parent 391a963 commit 65c365b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/ssa/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ func (state *debugState) liveness() []*BlockDebug {
source = v.Args[0]
case OpLoadReg:
switch a := v.Args[0]; a.Op {
case OpArg:
case OpArg, OpPhi:
source = a
case OpStoreReg:
source = a.Args[0]
Expand Down

0 comments on commit 65c365b

Please sign in to comment.