cmd/internal/gc: make all Node depths int32

Funcdepth was already int32. Make Escloopdepth
and Decldepth also int32 instead of int.

No functional changes for non-absurd code. Passes toolstash -cmp.

Change-Id: I47e145dd732b6a73cfcc6d45956df0dbccdcd999
Reviewed-on: https://go-review.googlesource.com/10129
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/cmd/internal/gc/esc.go b/src/cmd/internal/gc/esc.go
index a5b6a9b2b1fc329c1bfaece9394e92db1357ad86..a9a1748b9a46dfca69fa2018246b1efcce37148d 100644 (file)
--- a/src/cmd/internal/gc/esc.go
+++ b/src/cmd/internal/gc/esc.go
@@ -379,7 +379,7 @@ type EscState struct {
        theSink Node
 
        dsts      *NodeList // all dst nodes
-       loopdepth int       // for detecting nested loop scopes
+       loopdepth int32     // for detecting nested loop scopes
        pdepth    int       // for debug printing in recursions.
        dstcount  int       // diagnostic
        edgecount int       // diagnostic

diff --git a/src/cmd/internal/gc/go.go b/src/cmd/internal/gc/go.go
index 5fa85e25a72099861f9e6cd09525af5f859bca70..6a3379b896e4a25e0e51866379e3ebfc9df071cd 100644 (file)
--- a/src/cmd/internal/gc/go.go
+++ b/src/cmd/internal/gc/go.go
@@ -448,7 +448,7 @@ var nsavederrors int
 
 var nsyntaxerrors int
 
-var decldepth int
+var decldepth int32
 
 var safemode int
 

diff --git a/src/cmd/internal/gc/syntax.go b/src/cmd/internal/gc/syntax.go
index 818d546970d824ff4bff52be218916eee49f745d..50de7f74de62824433c55a372aca278c369a5c43 100644 (file)
--- a/src/cmd/internal/gc/syntax.go
+++ b/src/cmd/internal/gc/syntax.go
@@ -90,7 +90,7 @@ type Node struct {
        // Escape analysis.
        Escflowsrc   *NodeList // flow(this, src)
        Escretval    *NodeList // on OCALLxxx, list of dummy return values
-       Escloopdepth int       // -1: global, 0: return variables, 1:function top level, increased inside function for every loop or label to mark scopes
+       Escloopdepth int32     // -1: global, 0: return variables, 1:function top level, increased inside function for every loop or label to mark scopes
 
        Sym      *Sym  // various
        Vargen   int32 // unique name for OTYPE/ONAME within a function.  Function outputs are numbered starting at one.
@@ -108,7 +108,7 @@ type Node struct {
 type Name struct {
        Heapaddr  *Node // temp holding heap address of param
        Inlvar    *Node // ONAME substitute while inlining
-       Decldepth int   // declaration loop depth, increased for every loop or label
+       Decldepth int32 // declaration loop depth, increased for every loop or label
        Method    bool  // OCALLMETH name
        Readonly  bool
        Captured  bool // is the variable captured by a closure