cmd/compile: use newfuncname in dclfunc

Eliminates an inconsistency between user functions and generated
functions.

Passes toolstash-check.

Change-Id: I946b511ca81d88a0024b5932cb50f3d8b9e808f4
Reviewed-on: https://go-review.googlesource.com/103863
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>

diff --git a/src/cmd/compile/internal/gc/bexport.go b/src/cmd/compile/internal/gc/bexport.go
index 92dc06fc351e36ec9e661a6ceee74b76c9f04df2..a1bb7f84d317f94e8a93c855eb9e110a5ef70711 100644 (file)
--- a/src/cmd/compile/internal/gc/bexport.go
+++ b/src/cmd/compile/internal/gc/bexport.go
@@ -676,7 +676,7 @@ func fileLine(n *Node) (file string, line int) {
 }
 
 func isInlineable(n *Node) bool {
-       if exportInlined && n != nil && n.Func != nil {
+       if exportInlined && n != nil {
                // When lazily typechecking inlined bodies, some
                // re-exported ones may not have been typechecked yet.
                // Currently that can leave unresolved ONONAMEs in

diff --git a/src/cmd/compile/internal/gc/dcl.go b/src/cmd/compile/internal/gc/dcl.go
index 1fa68e9f4a5b6132f7472b19a17ba42dc0ea5cf7..147664e8dd4b6c592b763ebc15584b602d8d96eb 100644 (file)
--- a/src/cmd/compile/internal/gc/dcl.go
+++ b/src/cmd/compile/internal/gc/dcl.go
@@ -1060,7 +1060,7 @@ func dclfunc(sym *types.Sym, tfn *Node) *Node {
        }
 
        fn := nod(ODCLFUNC, nil, nil)
-       fn.Func.Nname = newname(sym)
+       fn.Func.Nname = newfuncname(sym)
        fn.Func.Nname.Name.Defn = fn
        fn.Func.Nname.Name.Param.Ntype = tfn
        declare(fn.Func.Nname, PFUNC)

diff --git a/src/cmd/compile/internal/gc/inl.go b/src/cmd/compile/internal/gc/inl.go
index d622307c63167551f4240ce7116e6f62ef5f3157..cab33f17f411b371dfc95388b25e45017314aaab 100644 (file)
--- a/src/cmd/compile/internal/gc/inl.go
+++ b/src/cmd/compile/internal/gc/inl.go
@@ -198,10 +198,6 @@ func inlFlood(n *Node) {
                Fatalf("inlFlood: unexpected %v, %v, %v", n, n.Op, n.Class())
        }
        if n.Func == nil {
-               // TODO(mdempsky): Should init have a Func too?
-               if n.Sym.Name == "init" {
-                       return
-               }
                Fatalf("inlFlood: missing Func on %v", n)
        }
        if n.Func.Inl.Len() == 0 {