[dev.typeparams] all: merge dev.regabi (7e0a81d) into dev.typeparams

[gostls13.git] / src / cmd / compile / internal / typecheck / dcl.go

diff --git a/src/cmd/compile/internal/typecheck/dcl.go b/src/cmd/compile/internal/typecheck/dcl.go
index bd54919c935d37be3fc11acbce2038b894ae1992..eab0bb09b29500b6dd2198daa912b46f56845450 100644 (file)
--- a/src/cmd/compile/internal/typecheck/dcl.go
+++ b/src/cmd/compile/internal/typecheck/dcl.go
@@ -41,7 +41,7 @@ func Declare(n *ir.Name, ctxt ir.Class) {
 
        s := n.Sym()
 
-       // kludgy: typecheckok means we're past parsing. Eg genwrapper may declare out of package names later.
+       // kludgy: TypecheckAllowed means we're past parsing. Eg reflectdata.methodWrapper may declare out of package names later.
        if !inimport && !TypecheckAllowed && s.Pkg != types.LocalPkg {
                base.ErrorfAt(n.Pos(), "cannot declare name %v", s)
        }
@@ -311,7 +311,7 @@ func FakeRecv() *types.Field {
 
 var fakeRecvField = FakeRecv
 
-var funcStack []funcStackEnt // stack of previous values of Curfn/dclcontext
+var funcStack []funcStackEnt // stack of previous values of ir.CurFunc/DeclContext
 
 type funcStackEnt struct {
        curfn      *ir.Func
@@ -401,14 +401,14 @@ func Temp(t *types.Type) *ir.Name {
 // make a new Node off the books
 func TempAt(pos src.XPos, curfn *ir.Func, t *types.Type) *ir.Name {
        if curfn == nil {
-               base.Fatalf("no curfn for tempAt")
+               base.Fatalf("no curfn for TempAt")
        }
        if curfn.Op() == ir.OCLOSURE {
-               ir.Dump("tempAt", curfn)
-               base.Fatalf("adding tempAt to wrong closure function")
+               ir.Dump("TempAt", curfn)
+               base.Fatalf("adding TempAt to wrong closure function")
        }
        if t == nil {
-               base.Fatalf("tempAt called with nil type")
+               base.Fatalf("TempAt called with nil type")
        }
        if t.Kind() == types.TFUNC && t.Recv() != nil {
                base.Fatalf("misuse of method type: %v", t)