qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 13:38:20 -07:00
Code Releases Activity

[dev.typeparams] cmd/compile: handle objStub earlier in reader

Browse Source 
There's no point in reading the object dictionary for a stub
declaration. Only the package that contains the full object definition
will contain an object dictionary.

Change-Id: I458b77d20745105bf46190ef552312bdb5ca4d06
Reviewed-on: https://go-review.googlesource.com/c/go/+/334409
Trust: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
This commit is contained in:
Matthew Dempsky 2021-07-13 13:25:16 -07:00
parent e5faa8d84b
commit 82744bfbfc
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/cmd/compile/internal/noder/reader.go
View File

@ -520,14 +520,22 @@ func (pr *pkgReader) objIdx(idx int, implicits, explicits []*types.Type) ir.Node
r.typeParamBounds(sym, implicits, explicits) r.typeParamBounds(sym, implicits, explicits)
origSym := sym
sym = r.mangle(sym)
if !sym.IsBlank() && sym.Def != nil {
return sym.Def.(ir.Node)
}
tag := codeObj(r.code(syncCodeObj)) tag := codeObj(r.code(syncCodeObj))
if tag == objStub {
assert(!sym.IsBlank())
switch sym.Pkg {
case types.BuiltinPkg, ir.Pkgs.Unsafe:
return sym.Def.(ir.Node)
}
if pri, ok := objReader[sym]; ok {
return pri.pr.objIdx(pri.idx, nil, explicits)
}
if haveLegacyImports {
assert(!r.hasTypeParams())
return typecheck.Resolve(ir.NewIdent(src.NoXPos, sym))
}
base.Fatalf("unresolved stub: %v", sym)
}
{ {
rdict := pr.newReader(relocObjDict, idx, syncObject1) rdict := pr.newReader(relocObjDict, idx, syncObject1)
@ -538,6 +546,11 @@ func (pr *pkgReader) objIdx(idx int, implicits, explicits []*types.Type) ir.Node
} }
} }
sym = r.mangle(sym)
if !sym.IsBlank() && sym.Def != nil {
return sym.Def.(*ir.Name)
}
do := func(op ir.Op, hasTParams bool) *ir.Name { do := func(op ir.Op, hasTParams bool) *ir.Name {
pos := r.pos() pos := r.pos()
if hasTParams { if hasTParams {
@ -560,17 +573,6 @@ func (pr *pkgReader) objIdx(idx int, implicits, explicits []*types.Type) ir.Node
default: default:
panic("unexpected object") panic("unexpected object")
case objStub:
if pri, ok := objReader[origSym]; ok {
return pri.pr.objIdx(pri.idx, nil, explicits)
}
if haveLegacyImports {
assert(!r.hasTypeParams())
return typecheck.Resolve(ir.NewIdent(src.NoXPos, origSym))
}
base.Fatalf("unresolved stub: %v", origSym)
panic("unreachable")
case objAlias: case objAlias:
name := do(ir.OTYPE, false) name := do(ir.OTYPE, false)
r.setType(name, r.typ()) r.setType(name, r.typ())