Skip to content

Commit

Permalink
cmd/compile/internal/types: don't export Nopkg anymore
Browse files Browse the repository at this point in the history
There's already special code to access it.

Change-Id: I28ca4f44a04262407ee9f1c826ada4e7eba44775
Reviewed-on: https://go-review.googlesource.com/41073
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
  • Loading branch information
griesemer committed Apr 19, 2017
1 parent b2a363b commit 62a2bee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/gc/reflect.go
Expand Up @@ -90,7 +90,7 @@ func uncommonSize(t *types.Type) int { // Sizeof(runtime.uncommontype{})
func makefield(name string, t *types.Type) *types.Field {
f := types.NewField()
f.Type = t
f.Sym = types.Nopkg.Lookup(name)
f.Sym = (*types.Pkg)(nil).Lookup(name)
return f
}

Expand Down
8 changes: 5 additions & 3 deletions src/cmd/compile/internal/types/pkg.go
Expand Up @@ -45,7 +45,7 @@ func NewPkg(path, name string) *Pkg {
return p
}

var Nopkg = &Pkg{
var nopkg = &Pkg{
Syms: make(map[string]*Sym),
}

Expand All @@ -58,8 +58,9 @@ var InitSyms []*Sym

// LookupOK looks up name in pkg and reports whether it previously existed.
func (pkg *Pkg) LookupOK(name string) (s *Sym, existed bool) {
// TODO(gri) remove this check in favor of specialized lookup
if pkg == nil {
pkg = Nopkg
pkg = nopkg
}
if s := pkg.Syms[name]; s != nil {
return s, true
Expand All @@ -77,8 +78,9 @@ func (pkg *Pkg) LookupOK(name string) (s *Sym, existed bool) {
}

func (pkg *Pkg) LookupBytes(name []byte) *Sym {
// TODO(gri) remove this check in favor of specialized lookup
if pkg == nil {
pkg = Nopkg
pkg = nopkg
}
if s := pkg.Syms[string(name)]; s != nil {
return s
Expand Down

0 comments on commit 62a2bee

Please sign in to comment.