Commit ec241db2 authored by Robert Griesemer's avatar Robert Griesemer

cmd/compile: move and rename mkpkg to types.NewPkg

That's where it belongs. Also, moved pkgMap and pkgs globals.

Change-Id: I531727fe5ce162c403efefec82f4cc90afa326d7
Reviewed-on: https://go-review.googlesource.com/41071Reviewed-by: default avatarMatthew Dempsky <mdempsky@google.com>
parent ff7994ac
...@@ -291,7 +291,7 @@ func (p *importer) pkg() *types.Pkg { ...@@ -291,7 +291,7 @@ func (p *importer) pkg() *types.Pkg {
// add package to pkgList // add package to pkgList
pkg := p.imp pkg := p.imp
if path != "" { if path != "" {
pkg = mkpkg(path) pkg = types.NewPkg(path)
} }
if pkg.Name == "" { if pkg.Name == "" {
pkg.Name = name pkg.Name = name
......
...@@ -556,7 +556,7 @@ func makepartialcall(fn *Node, t0 *types.Type, meth *types.Sym) *Node { ...@@ -556,7 +556,7 @@ func makepartialcall(fn *Node, t0 *types.Type, meth *types.Sym) *Node {
} }
if spkg == nil { if spkg == nil {
if makepartialcall_gopkg == nil { if makepartialcall_gopkg == nil {
makepartialcall_gopkg = mkpkg("go") makepartialcall_gopkg = types.NewPkg("go")
} }
spkg = makepartialcall_gopkg spkg = makepartialcall_gopkg
} }
......
...@@ -916,7 +916,7 @@ func methodsym(nsym *types.Sym, t0 *types.Type, iface bool) *types.Sym { ...@@ -916,7 +916,7 @@ func methodsym(nsym *types.Sym, t0 *types.Type, iface bool) *types.Sym {
if spkg == nil { if spkg == nil {
if methodsym_toppkg == nil { if methodsym_toppkg == nil {
methodsym_toppkg = mkpkg("go") methodsym_toppkg = types.NewPkg("go")
} }
spkg = methodsym_toppkg spkg = methodsym_toppkg
} }
......
...@@ -173,13 +173,13 @@ func dumpexport() { ...@@ -173,13 +173,13 @@ func dumpexport() {
// verify that we can read the copied export data back in // verify that we can read the copied export data back in
// (use empty package map to avoid collisions) // (use empty package map to avoid collisions)
savedPkgMap := pkgMap savedPkgMap := types.PkgMap
savedPkgs := pkgs savedPkgs := types.PkgList
pkgMap = make(map[string]*types.Pkg) types.PkgMap = make(map[string]*types.Pkg)
pkgs = nil types.PkgList = nil
Import(mkpkg(""), bufio.NewReader(&copy)) // must not die Import(types.NewPkg(""), bufio.NewReader(&copy)) // must not die
pkgs = savedPkgs types.PkgList = savedPkgs
pkgMap = savedPkgMap types.PkgMap = savedPkgMap
} else { } else {
size = export(bout.Writer, Debug_export != 0) size = export(bout.Writer, Debug_export != 0)
} }
......
...@@ -122,15 +122,15 @@ func Main(archInit func(*Arch)) { ...@@ -122,15 +122,15 @@ func Main(archInit func(*Arch)) {
Ctxt.DiagFunc = yyerror Ctxt.DiagFunc = yyerror
Ctxt.Bso = bufio.NewWriter(os.Stdout) Ctxt.Bso = bufio.NewWriter(os.Stdout)
localpkg = mkpkg("") localpkg = types.NewPkg("")
localpkg.Prefix = "\"\"" localpkg.Prefix = "\"\""
// pseudo-package, for scoping // pseudo-package, for scoping
builtinpkg = mkpkg("go.builtin") builtinpkg = types.NewPkg("go.builtin")
builtinpkg.Prefix = "go.builtin" // not go%2ebuiltin builtinpkg.Prefix = "go.builtin" // not go%2ebuiltin
// pseudo-package, accessed by import "unsafe" // pseudo-package, accessed by import "unsafe"
unsafepkg = mkpkg("unsafe") unsafepkg = types.NewPkg("unsafe")
unsafepkg.Name = "unsafe" unsafepkg.Name = "unsafe"
// Pseudo-package that contains the compiler's builtin // Pseudo-package that contains the compiler's builtin
...@@ -138,28 +138,28 @@ func Main(archInit func(*Arch)) { ...@@ -138,28 +138,28 @@ func Main(archInit func(*Arch)) {
// separate package to avoid conflicts with package runtime's // separate package to avoid conflicts with package runtime's
// actual declarations, which may differ intentionally but // actual declarations, which may differ intentionally but
// insignificantly. // insignificantly.
Runtimepkg = mkpkg("go.runtime") Runtimepkg = types.NewPkg("go.runtime")
Runtimepkg.Name = "runtime" Runtimepkg.Name = "runtime"
Runtimepkg.Prefix = "runtime" Runtimepkg.Prefix = "runtime"
// pseudo-packages used in symbol tables // pseudo-packages used in symbol tables
itabpkg = mkpkg("go.itab") itabpkg = types.NewPkg("go.itab")
itabpkg.Name = "go.itab" itabpkg.Name = "go.itab"
itabpkg.Prefix = "go.itab" // not go%2eitab itabpkg.Prefix = "go.itab" // not go%2eitab
itablinkpkg = mkpkg("go.itablink") itablinkpkg = types.NewPkg("go.itablink")
itablinkpkg.Name = "go.itablink" itablinkpkg.Name = "go.itablink"
itablinkpkg.Prefix = "go.itablink" // not go%2eitablink itablinkpkg.Prefix = "go.itablink" // not go%2eitablink
trackpkg = mkpkg("go.track") trackpkg = types.NewPkg("go.track")
trackpkg.Name = "go.track" trackpkg.Name = "go.track"
trackpkg.Prefix = "go.track" // not go%2etrack trackpkg.Prefix = "go.track" // not go%2etrack
typepkg = mkpkg("type") typepkg = types.NewPkg("type")
typepkg.Name = "type" typepkg.Name = "type"
// pseudo-package used for map zero values // pseudo-package used for map zero values
mappkg = mkpkg("go.map") mappkg = types.NewPkg("go.map")
mappkg.Name = "go.map" mappkg.Name = "go.map"
mappkg.Prefix = "go.map" mappkg.Prefix = "go.map"
...@@ -261,11 +261,11 @@ func Main(archInit func(*Arch)) { ...@@ -261,11 +261,11 @@ func Main(archInit func(*Arch)) {
startProfile() startProfile()
if flag_race { if flag_race {
racepkg = mkpkg("runtime/race") racepkg = types.NewPkg("runtime/race")
racepkg.Name = "race" racepkg.Name = "race"
} }
if flag_msan { if flag_msan {
msanpkg = mkpkg("runtime/msan") msanpkg = types.NewPkg("runtime/msan")
msanpkg.Name = "msan" msanpkg.Name = "msan"
} }
if flag_race && flag_msan { if flag_race && flag_msan {
...@@ -850,7 +850,7 @@ func importfile(f *Val) *types.Pkg { ...@@ -850,7 +850,7 @@ func importfile(f *Val) *types.Pkg {
errorexit() errorexit()
} }
importpkg := mkpkg(path_) importpkg := types.NewPkg(path_)
if importpkg.Imported { if importpkg.Imported {
return importpkg return importpkg
} }
......
...@@ -1501,7 +1501,7 @@ func dumptypestructs() { ...@@ -1501,7 +1501,7 @@ func dumptypestructs() {
} }
// generate import strings for imported packages // generate import strings for imported packages
for _, p := range pkgs { for _, p := range types.PkgList {
if p.Direct { if p.Direct {
dimportpath(p) dimportpath(p)
} }
...@@ -1535,7 +1535,7 @@ func dumptypestructs() { ...@@ -1535,7 +1535,7 @@ func dumptypestructs() {
if flag_msan { if flag_msan {
dimportpath(msanpkg) dimportpath(msanpkg)
} }
dimportpath(mkpkg("main")) dimportpath(types.NewPkg("main"))
} }
} }
......
...@@ -1957,23 +1957,6 @@ func ngotype(n *Node) *types.Sym { ...@@ -1957,23 +1957,6 @@ func ngotype(n *Node) *types.Sym {
return nil return nil
} }
var pkgMap = make(map[string]*types.Pkg)
var pkgs []*types.Pkg
func mkpkg(path string) *types.Pkg {
if p := pkgMap[path]; p != nil {
return p
}
p := new(types.Pkg)
p.Path = path
p.Prefix = objabi.PathToPrefix(path)
p.Syms = make(map[string]*types.Sym)
pkgMap[path] = p
pkgs = append(pkgs, p)
return p
}
// The result of addinit MUST be assigned back to n, e.g. // The result of addinit MUST be assigned back to n, e.g.
// n.Left = addinit(n.Left, init) // n.Left = addinit(n.Left, init)
func addinit(n *Node, init []*Node) *Node { func addinit(n *Node, init []*Node) *Node {
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
package types package types
import "cmd/internal/obj" import (
"cmd/internal/obj"
"cmd/internal/objabi"
)
type Pkg struct { type Pkg struct {
Name string // package name, e.g. "sys" Name string // package name, e.g. "sys"
...@@ -16,6 +19,23 @@ type Pkg struct { ...@@ -16,6 +19,23 @@ type Pkg struct {
Syms map[string]*Sym Syms map[string]*Sym
} }
var PkgMap = make(map[string]*Pkg)
var PkgList []*Pkg
func NewPkg(path string) *Pkg {
if p := PkgMap[path]; p != nil {
return p
}
p := new(Pkg)
p.Path = path
p.Prefix = objabi.PathToPrefix(path)
p.Syms = make(map[string]*Sym)
PkgMap[path] = p
PkgList = append(PkgList, p)
return p
}
var Nopkg = &Pkg{ var Nopkg = &Pkg{
Syms: make(map[string]*Sym), Syms: make(map[string]*Sym),
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment