diff options
| author | Austin Clements <austin@google.com> | 2020-08-17 13:17:26 +0000 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2020-08-17 14:44:28 +0000 |
| commit | a22ec6e650669f5101c7e0955d82e29d644eef4e (patch) | |
| tree | 8b52a250c5f5309823574582050376270411ab8b /src/cmd/internal/obj/s390x | |
| parent | d19fedd180fceb6a60961e19387893ddb047e4e6 (diff) | |
| download | go-a22ec6e650669f5101c7e0955d82e29d644eef4e.tar.xz | |
Revert "cmd/internal/obj: fix inline marker issue on s390x"
This reverts CL 247697.
Reason for revert: This change broke the linux-arm builder.
Change-Id: I8ca0d5b3b2ea0109ffbfadeab1406a1b60e7d18d
Reviewed-on: https://go-review.googlesource.com/c/go/+/248718
Reviewed-by: Michael Munday <mike.munday@ibm.com>
Run-TryBot: Michael Munday <mike.munday@ibm.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/internal/obj/s390x')
| -rw-r--r-- | src/cmd/internal/obj/s390x/objz.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/cmd/internal/obj/s390x/objz.go b/src/cmd/internal/obj/s390x/objz.go index ef6335d849..b14dc810fa 100644 --- a/src/cmd/internal/obj/s390x/objz.go +++ b/src/cmd/internal/obj/s390x/objz.go @@ -283,6 +283,17 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) { ACMPUBNE: q = p p.Mark |= BRANCH + if p.Pcond != nil { + q := p.Pcond + for q.As == obj.ANOP { + q = q.Link + p.Pcond = q + } + } + + case obj.ANOP: + q.Link = p.Link /* q is non-nop */ + p.Link.Mark |= p.Mark default: q = p |