cmd/compile: enable nil check logging for other architectures.

Change-Id: If82ebd9cd6470863eb5de9e031e7905a66218857
Reviewed-on: https://go-review.googlesource.com/c/go/+/204159
Run-TryBot: David Chase <drchase@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>

diff --git a/src/cmd/compile/internal/amd64/ssa.go b/src/cmd/compile/internal/amd64/ssa.go
index 43a4aed1d978d55c4712c5d63bb97e6f3b59d9a1..9ee322b389d52ac00055eb2c2495fec0bc90f84f 100644 (file)
--- a/src/cmd/compile/internal/amd64/ssa.go
+++ b/src/cmd/compile/internal/amd64/ssa.go
@@ -5,11 +5,11 @@
 package amd64
 
 import (
-       "cmd/compile/internal/logopt"
        "fmt"
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"

diff --git a/src/cmd/compile/internal/arm/ssa.go b/src/cmd/compile/internal/arm/ssa.go
index e20a72cfc8e0b7b8139150c1c10b9e618e05296f..9935616f413d29278d85df58417db9fca9d6fade 100644 (file)
--- a/src/cmd/compile/internal/arm/ssa.go
+++ b/src/cmd/compile/internal/arm/ssa.go
@@ -10,6 +10,7 @@ import (
        "math/bits"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -737,6 +738,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                gc.AddAux(&p.From, v)
                p.To.Type = obj.TYPE_REG
                p.To.Reg = arm.REGTMP
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/arm64/ssa.go b/src/cmd/compile/internal/arm64/ssa.go
index 24b6383bbc985ca8f28cc83247790cd2910b15da..e7d0f83d82b85bb7585b5512bac3a3d67966ad16 100644 (file)
--- a/src/cmd/compile/internal/arm64/ssa.go
+++ b/src/cmd/compile/internal/arm64/ssa.go
@@ -8,6 +8,7 @@ import (
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -901,6 +902,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                gc.AddAux(&p.From, v)
                p.To.Type = obj.TYPE_REG
                p.To.Reg = arm64.REGTMP
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Line==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/mips/ssa.go b/src/cmd/compile/internal/mips/ssa.go
index 7efd8e105bd57a08bebe856a37be9f5af6d59641..9d11c6bf53ae78652fa7fadf2eedff4943dcc385 100644 (file)
--- a/src/cmd/compile/internal/mips/ssa.go
+++ b/src/cmd/compile/internal/mips/ssa.go
@@ -8,6 +8,7 @@ import (
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -762,6 +763,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                gc.AddAux(&p.From, v)
                p.To.Type = obj.TYPE_REG
                p.To.Reg = mips.REGTMP
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/mips64/ssa.go b/src/cmd/compile/internal/mips64/ssa.go
index 28652f0cc422431636fb5bb6675c2a3ec5a3bd4f..2727c4d8a8340b6481f972a277f98844c9067623 100644 (file)
--- a/src/cmd/compile/internal/mips64/ssa.go
+++ b/src/cmd/compile/internal/mips64/ssa.go
@@ -8,6 +8,7 @@ import (
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -720,6 +721,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                gc.AddAux(&p.From, v)
                p.To.Type = obj.TYPE_REG
                p.To.Reg = mips.REGTMP
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/ppc64/ssa.go b/src/cmd/compile/internal/ppc64/ssa.go
index 73d1d9d3a03e5abdcc4a819e9eb5d7e2fcbd77b7..591f3666e7f2a9f25e029e1f34f25eb05d36d255 100644 (file)
--- a/src/cmd/compile/internal/ppc64/ssa.go
+++ b/src/cmd/compile/internal/ppc64/ssa.go
@@ -6,6 +6,7 @@ package ppc64
 
 import (
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -1313,6 +1314,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                        p.To.Type = obj.TYPE_REG
                        p.To.Reg = ppc64.REGTMP
                }
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/s390x/ssa.go b/src/cmd/compile/internal/s390x/ssa.go
index af45a561c67bed8c0f180fdf26984a73432eb706..885c14b33ad60145cdef39fd8e1e6233dd1a6d64 100644 (file)
--- a/src/cmd/compile/internal/s390x/ssa.go
+++ b/src/cmd/compile/internal/s390x/ssa.go
@@ -8,6 +8,7 @@ import (
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -601,6 +602,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                gc.AddAux(&p.From, v)
                p.To.Type = obj.TYPE_REG
                p.To.Reg = s390x.REGTMP
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/wasm/ssa.go b/src/cmd/compile/internal/wasm/ssa.go
index e07589234894ad69fa8218578ed0726a19246c0c..7861667b8893dbf5b65145fdf8fea227fabb17ca 100644 (file)
--- a/src/cmd/compile/internal/wasm/ssa.go
+++ b/src/cmd/compile/internal/wasm/ssa.go
@@ -6,6 +6,7 @@ package wasm
 
 import (
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -160,6 +161,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                p := s.Prog(wasm.ACALLNORESUME)
                p.To = obj.Addr{Type: obj.TYPE_MEM, Name: obj.NAME_EXTERN, Sym: gc.SigPanic}
                s.Prog(wasm.AEnd)
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }

diff --git a/src/cmd/compile/internal/x86/ssa.go b/src/cmd/compile/internal/x86/ssa.go
index 603903ba48e2c3dd8f28d8370454217b660b41e1..aa68e9163ae56b427559c28df9edafa56806455d 100644 (file)
--- a/src/cmd/compile/internal/x86/ssa.go
+++ b/src/cmd/compile/internal/x86/ssa.go
@@ -9,6 +9,7 @@ import (
        "math"
 
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/logopt"
        "cmd/compile/internal/ssa"
        "cmd/compile/internal/types"
        "cmd/internal/obj"
@@ -845,6 +846,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                p.To.Type = obj.TYPE_MEM
                p.To.Reg = v.Args[0].Reg()
                gc.AddAux(&p.To, v)
+               if logopt.Enabled() {
+                       logopt.LogOpt(v.Pos, "nilcheck", "genssa", v.Block.Func.Name)
+               }
                if gc.Debug_checknil != 0 && v.Pos.Line() > 1 { // v.Pos.Line()==1 in generated wrappers
                        gc.Warnl(v.Pos, "generated nil check")
                }