[dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge

Semi-regular merge from tip into ssa branch.

Change-Id: I9cbe23f566410496d4ceb97c1435e2df7f2b56ec

diff --combined src/cmd/compile/internal/gc/pgen.go
index 6a6c213b848f7b1d8945bea5fc894c201499d15e,47cb8b12012af8ee74c9572b02118c8d694094d0..33c600aed9ceae37c68ccc285f4ddf1de578cebc
--- 1/src/cmd/compile/internal/gc/pgen.go
--- 2/src/cmd/compile/internal/gc/pgen.go
+++ b/src/cmd/compile/internal/gc/pgen.go
@@@ -5,7 -5,6 +5,7 @@@
  package gc
  
  import (
 +      "cmd/compile/internal/ssa"
        "cmd/internal/obj"
        "crypto/md5"
        "fmt"
@@@ -354,8 -353,6 +354,8 @@@ func compile(fn *Node) 
        var nam *Node
        var gcargs *Sym
        var gclocals *Sym
 +      var ssafn *ssa.Func
 +      var usessa bool
        if fn.Nbody == nil {
                if pure_go != 0 || strings.HasPrefix(fn.Func.Nname.Sym.Name, "init.") {
                        Yyerror("missing function body for %q", fn.Func.Nname.Sym.Name)
@@@ -407,10 -404,6 +407,10 @@@
                goto ret
        }
  
 +      // Build an SSA backend function.
 +      // TODO: get rid of usessa.
 +      ssafn, usessa = buildssa(Curfn)
 +
        continpc = nil
        breakpc = nil
  
@@@ -425,6 -418,7 +425,7 @@@
                nam = nil
        }
        ptxt = Thearch.Gins(obj.ATEXT, nam, &nod1)
+       Afunclit(&ptxt.From, Curfn.Func.Nname)
        ptxt.From3 = new(obj.Addr)
        if fn.Func.Dupok {
                ptxt.From3.Offset |= obj.DUPOK
@@@ -438,6 -432,9 +439,9 @@@
        if fn.Func.Nosplit {
                ptxt.From3.Offset |= obj.NOSPLIT
        }
+       if fn.Func.Systemstack {
+               ptxt.From.Sym.Cfunc = 1
+       }
  
        // Clumsy but important.
        // See test/recover.go for test cases and src/reflect/value.go
@@@ -448,8 -445,6 +452,6 @@@
                }
        }
  
-       Afunclit(&ptxt.From, Curfn.Func.Nname)
- 
        ginit()
  
        gcargs = makefuncdatasym("gcargs·%d", obj.FUNCDATA_ArgsPointerMaps)
@@@ -472,10 -467,6 +474,10 @@@
                }
        }
  
 +      if ssafn != nil && usessa {
 +              genssa(ssafn, ptxt, gcargs, gclocals)
 +              return
 +      }
        Genlist(Curfn.Func.Enter)
        Genlist(Curfn.Nbody)
        gclean()