From b098c0f467e5ce70b936381c439a0cbafc3316d3 Mon Sep 17 00:00:00 2001 From: Lynn Boger Date: Wed, 1 May 2019 10:55:27 -0400 Subject: [PATCH] cmd/compile/internal/ppc64: improve naming for ginsnop2 This is a follow up from a review comment at the end of the last Go release, to provide a more meaningful name for ginsnop2. Updates #30475 Change-Id: Ice9efd763bf2204a9e8c55ae230d3e8a80210108 Reviewed-on: https://go-review.googlesource.com/c/go/+/174757 Run-TryBot: Lynn Boger TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- src/cmd/compile/internal/ppc64/galign.go | 2 +- src/cmd/compile/internal/ppc64/ggen.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cmd/compile/internal/ppc64/galign.go b/src/cmd/compile/internal/ppc64/galign.go index 8ad3084410..c6866e65e7 100644 --- a/src/cmd/compile/internal/ppc64/galign.go +++ b/src/cmd/compile/internal/ppc64/galign.go @@ -21,7 +21,7 @@ func Init(arch *gc.Arch) { arch.ZeroRange = zerorange arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop - arch.Ginsnopdefer = ginsnop2 + arch.Ginsnopdefer = ginsnopdefer arch.SSAMarkMoves = ssaMarkMoves arch.SSAGenValue = ssaGenValue diff --git a/src/cmd/compile/internal/ppc64/ggen.go b/src/cmd/compile/internal/ppc64/ggen.go index ea66baa007..a63a0f0f77 100644 --- a/src/cmd/compile/internal/ppc64/ggen.go +++ b/src/cmd/compile/internal/ppc64/ggen.go @@ -67,8 +67,9 @@ func ginsnop(pp *gc.Progs) *obj.Prog { return p } -func ginsnop2(pp *gc.Progs) *obj.Prog { - // PPC64 is unusual because TWO nops are required +func ginsnopdefer(pp *gc.Progs) *obj.Prog { + // On PPC64 two nops are required in the defer case. + // // (see gc/cgen.go, gc/plive.go -- copy of comment below) // // On ppc64, when compiling Go into position -- 2.50.0