all: merge dev.inline into master

[gostls13.git] / src / cmd / compile / internal / gc / type.go

diff --git a/src/cmd/compile/internal/gc/type.go b/src/cmd/compile/internal/gc/type.go
index 5f04f680c737ebc6972cb042961d371fed83d2c6..249cd3e3b95e5ae1f2c96e432745afac3aaac039 100644 (file)
--- a/src/cmd/compile/internal/gc/type.go
+++ b/src/cmd/compile/internal/gc/type.go
@@ -11,6 +11,7 @@ package gc
 
 import (
        "cmd/compile/internal/ssa"
+       "cmd/internal/src"
        "fmt"
 )
 
@@ -149,9 +150,9 @@ type Type struct {
        sliceOf *Type
        ptrTo   *Type
 
-       Sym    *Sym  // symbol containing name, for named types
-       Vargen int32 // unique name for OTYPE/ONAME
-       Lineno int32 // line at which this type was declared, implicitly or explicitly
+       Sym    *Sym     // symbol containing name, for named types
+       Vargen int32    // unique name for OTYPE/ONAME
+       Pos    src.XPos // position at which this type was declared, implicitly or explicitly
 
        Etype      EType // kind of type
        Noalg      bool  // suppress hash and eq algorithm generation
@@ -181,8 +182,8 @@ func (t *Type) MapType() *MapType {
 
 // ForwardType contains Type fields specific to forward types.
 type ForwardType struct {
-       Copyto      []*Node // where to copy the eventual value to
-       Embedlineno int32   // first use of this type as an embedded type
+       Copyto      []*Node  // where to copy the eventual value to
+       Embedlineno src.XPos // first use of this type as an embedded type
 }
 
 // ForwardType returns t's extra forward-type-specific fields.
@@ -375,9 +376,9 @@ func (f *Fields) Append(s ...*Field) {
 // typ returns a new Type of the specified kind.
 func typ(et EType) *Type {
        t := &Type{
-               Etype:  et,
-               Width:  BADWIDTH,
-               Lineno: lineno,
+               Etype: et,
+               Width: BADWIDTH,
+               Pos:   lineno,
        }
        t.Orig = t
        // TODO(josharian): lazily initialize some of these?