cmd/internal/gc: make class uint8 throughout

This prevents conversion noise.

No functional changes. Passes toolstash -cmp.

Change-Id: I238adf28680f875217827931a689ce7f19a9b371
Reviewed-on: https://go-review.googlesource.com/8164
Reviewed-by: David Chase <drchase@google.com>

diff --git a/src/cmd/internal/gc/dcl.go b/src/cmd/internal/gc/dcl.go
index 846ec7d8f1c439eb2242b66be1ca9e1a210fcd7f..c8375dd477ad1341db5609363a654a97e6345b85 100644 (file)
--- a/src/cmd/internal/gc/dcl.go
+++ b/src/cmd/internal/gc/dcl.go
@@ -165,7 +165,7 @@ var vargen int
 
 var declare_typegen int
 
-func declare(n *Node, ctxt int) {
+func declare(n *Node, ctxt uint8) {
        if ctxt == PDISCARD {
                return
        }
@@ -232,7 +232,7 @@ func declare(n *Node, ctxt int) {
        autoexport(n, ctxt)
 }
 
-func addvar(n *Node, t *Type, ctxt int) {
+func addvar(n *Node, t *Type, ctxt uint8) {
        if n == nil || n.Sym == nil || (n.Op != ONAME && n.Op != ONONAME) || t == nil {
                Fatal("addvar: n=%v t=%v nil", Nconv(n, 0), Tconv(t, 0))
        }

diff --git a/src/cmd/internal/gc/export.go b/src/cmd/internal/gc/export.go
index f9508891011c758f6794d80fa6bd7112d49f82bb..76bb55ad4dd5914df83d38cf8756eb5ccfea47b0 100644 (file)
--- a/src/cmd/internal/gc/export.go
+++ b/src/cmd/internal/gc/export.go
@@ -57,7 +57,7 @@ func exportedsym(sym *Sym) bool {
        return sym.Pkg == localpkg && exportname(sym.Name)
 }
 
-func autoexport(n *Node, ctxt int) {
+func autoexport(n *Node, ctxt uint8) {
        if n == nil || n.Sym == nil {
                return
        }

diff --git a/src/cmd/internal/gc/go.go b/src/cmd/internal/gc/go.go
index a6e525aba1831cd5d4c1beee4ce2c43942f31867..1abbfe41d096e347c3a5b80fef3aae8c125e9a6f 100644 (file)
--- a/src/cmd/internal/gc/go.go
+++ b/src/cmd/internal/gc/go.go
@@ -333,7 +333,7 @@ const (
 
 // declaration context
 const (
-       Pxxx      = iota
+       Pxxx      = uint8(iota)
        PEXTERN   // global variable
        PAUTO     // local variables
        PPARAM    // input arguments
@@ -343,7 +343,7 @@ const (
 
        PDISCARD // discard during parse of duplicate import
 
-       PHEAP = 1 << 7 // an extra bit to identify an escaped variable
+       PHEAP = uint8(1 << 7) // an extra bit to identify an escaped variable
 )
 
 const (
@@ -594,7 +594,7 @@ var importlist *NodeList // imported functions and methods with inlinable bodies
 
 var funcsyms *NodeList
 
-var dclcontext int // PEXTERN/PAUTO
+var dclcontext uint8 // PEXTERN/PAUTO
 
 var incannedimport int
 

diff --git a/src/cmd/internal/gc/plive.go b/src/cmd/internal/gc/plive.go
index 876f43e1a96f3c58c9af932bd1830c9e77fff182..02863fb5e89c1d124ce7f7a788b4f3d9af74e60d 100644 (file)
--- a/src/cmd/internal/gc/plive.go
+++ b/src/cmd/internal/gc/plive.go
@@ -828,10 +828,10 @@ func checkparam(fn *Node, p *obj.Prog, n *Node) {
                return
        }
        var a *Node
-       var class int
+       var class uint8
        for l := fn.Func.Dcl; l != nil; l = l.Next {
                a = l.N
-               class = int(a.Class) &^ PHEAP
+               class = a.Class &^ PHEAP
                if a.Op == ONAME && (class == PPARAM || class == PPARAMOUT) && a == n {
                        return
                }

diff --git a/src/cmd/internal/gc/racewalk.go b/src/cmd/internal/gc/racewalk.go
index 85225c3d83d602b39c78418b6a2faad0794b1069..4f7ed2d70db343aad261e1df4baac0d242ba218d 100644 (file)
--- a/src/cmd/internal/gc/racewalk.go
+++ b/src/cmd/internal/gc/racewalk.go
@@ -492,7 +492,7 @@ func callinstr(np **Node, init **NodeList, wr int, skip int) bool {
        if isartificial(b) {
                return false
        }
-       class := int(b.Class)
+       class := b.Class
 
        // BUG: we _may_ want to instrument PAUTO sometimes
        // e.g. if we've got a local variable/method receiver

diff --git a/src/cmd/internal/gc/walk.go b/src/cmd/internal/gc/walk.go
index 03e79264e345b9c87e55f46df6f437b51af70a46..c10201aa2e3855b4ad8333040b5422d32e5d3274 100644 (file)
--- a/src/cmd/internal/gc/walk.go
+++ b/src/cmd/internal/gc/walk.go
@@ -287,9 +287,9 @@ func walkstmt(np **Node) {
                        // so that reorder3 can fix up conflicts
                        var rl *NodeList
 
-                       var cl int
+                       var cl uint8
                        for ll := Curfn.Func.Dcl; ll != nil; ll = ll.Next {
-                               cl = int(ll.N.Class) &^ PHEAP
+                               cl = ll.N.Class &^ PHEAP
                                if cl == PAUTO {
                                        break
                                }