diff options
| author | Keith Randall <khr@golang.org> | 2020-08-27 23:34:32 +0000 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-08-28 02:10:13 +0000 |
| commit | 26ad27bb026a34149ad0b1d7d56723c8b5dee3d7 (patch) | |
| tree | 3d20422f8e65669919ac9980c0868d6508d8f544 /src/cmd/internal/obj/util.go | |
| parent | 42fd1306cea2dc2ff91bd5208d9593721ab5a30f (diff) | |
| download | go-26ad27bb026a34149ad0b1d7d56723c8b5dee3d7.tar.xz | |
Revert "cmd/compile,cmd/asm: simplify recording of branch targets"
This reverts CL 243318.
Reason for revert: Seems to be crashing some builders.
Change-Id: I2ffc59bc5535be60b884b281c8d0eff4647dc756
Reviewed-on: https://go-review.googlesource.com/c/go/+/251169
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/internal/obj/util.go')
| -rw-r--r-- | src/cmd/internal/obj/util.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cmd/internal/obj/util.go b/src/cmd/internal/obj/util.go index a30ccf0564..d020026445 100644 --- a/src/cmd/internal/obj/util.go +++ b/src/cmd/internal/obj/util.go @@ -251,8 +251,10 @@ func WriteDconv(w io.Writer, p *Prog, a *Addr) { case TYPE_BRANCH: if a.Sym != nil { fmt.Fprintf(w, "%s(SB)", a.Sym.Name) - } else if a.Target() != nil { - fmt.Fprint(w, a.Target().Pc) + } else if p != nil && p.Pcond != nil { + fmt.Fprint(w, p.Pcond.Pc) + } else if a.Val != nil { + fmt.Fprint(w, a.Val.(*Prog).Pc) } else { fmt.Fprintf(w, "%d(PC)", a.Offset) } |