exp/ssa: omit Function's package name when printing intra-package references.

R=iant
CC=golang-dev
https://golang.org/cl/7307105

diff --git a/src/pkg/exp/ssa/func.go b/src/pkg/exp/ssa/func.go
index 507eb7c329af90142978ce3fe5b84aa57c0b680b..d8f11d9c578f23b550d9f4275daf8daa8c0dc7fd 100644 (file)
--- a/src/pkg/exp/ssa/func.go
+++ b/src/pkg/exp/ssa/func.go
@@ -344,6 +344,11 @@ func (f *Function) emit(instr Instruction) Value {
 //      "func@5.32"                 // an anonymous function
 //
 func (f *Function) FullName() string {
+       return f.fullName(nil)
+}
+
+// Like FullName, but if from==f.Pkg, suppress package qualification.
+func (f *Function) fullName(from *Package) string {
        // Anonymous?
        if f.Enclosing != nil {
                return f.Name_
@@ -353,11 +358,20 @@ func (f *Function) FullName() string {
 
        // Synthetic?
        if f.Pkg == nil {
+               var recvType types.Type
                if recv != nil {
-                       // TODO(adonovan): print type package-qualified, if NamedType.
-                       return fmt.Sprintf("(%s).%s", recv.Type, f.Name_) // bridge method
+                       recvType = recv.Type // bridge method
+               } else {
+                       recvType = f.Params[0].Type() // interface method thunk
                }
-               return fmt.Sprintf("(%s).%s", f.Params[0].Type(), f.Name_) // interface method thunk
+               // TODO(adonovan): print type package-qualified, if NamedType.
+               return fmt.Sprintf("(%s).%s", recvType, f.Name_)
+       }
+
+       // "pkg." prefix for cross-package references only.
+       var pkgQual string
+       if from != f.Pkg {
+               pkgQual = f.Pkg.ImportPath + "."
        }
 
        // Declared method?
@@ -366,11 +380,11 @@ func (f *Function) FullName() string {
                if isPointer(recv.Type) {
                        star = "*"
                }
-               return fmt.Sprintf("(%s%s.%s).%s", star, f.Pkg.ImportPath, deref(recv.Type), f.Name_)
+               return fmt.Sprintf("(%s%s%s).%s", star, pkgQual, deref(recv.Type), f.Name_)
        }
 
        // Package-level function.
-       return fmt.Sprintf("%s.%s", f.Pkg.ImportPath, f.Name_)
+       return pkgQual + f.Name_
 }
 
 // DumpTo prints to w a human readable "disassembly" of the SSA code of

diff --git a/src/pkg/exp/ssa/print.go b/src/pkg/exp/ssa/print.go
index 4e55dc9ff5170cdfeab22545b0999149a970cf0d..f503a186ae41caf140b2f53d15a985aba3399124 100644 (file)
--- a/src/pkg/exp/ssa/print.go
+++ b/src/pkg/exp/ssa/print.go
@@ -20,9 +20,9 @@ func (id Id) String() string {
 }
 
 // relName returns the name of v relative to i.
-// In most cases, this is identical to v.Name(), but for cross-package
-// references to Functions (including methods) and Globals, the
-// package-qualified FullName is used instead.
+// In most cases, this is identical to v.Name(), but for references to
+// Functions (including methods) and Globals, the FullName is used
+// instead, explicitly package-qualified for cross-package references.
 //
 func relName(v Value, i Instruction) string {
        switch v := v.(type) {
@@ -32,10 +32,7 @@ func relName(v Value, i Instruction) string {
                }
                return v.FullName()
        case *Function:
-               if v.Pkg == nil || v.Pkg == i.Block().Func.Pkg {
-                       return v.Name()
-               }
-               return v.FullName()
+               return v.fullName(i.Block().Func.Pkg)
        }
        return v.Name()
 }

diff --git a/src/pkg/exp/ssa/ssa.go b/src/pkg/exp/ssa/ssa.go
index fa55c20dda2b21301ef3a71f6c7ce0b923564e77..acc84c6130f22047b5ac977094b8f3ec6447a362 100644 (file)
--- a/src/pkg/exp/ssa/ssa.go
+++ b/src/pkg/exp/ssa/ssa.go
@@ -204,7 +204,7 @@ type Function struct {
 
        Pos       token.Pos // location of the definition
        Enclosing *Function // enclosing function if anon; nil if global
-       Pkg       *Package  // enclosing package; nil for some synthetic methods
+       Pkg       *Package  // enclosing package for Go source functions; otherwise nil
        Prog      *Program  // enclosing program
        Params    []*Parameter
        FreeVars  []*Capture // free variables whose values must be supplied by closure