From: David Chase <drchase@google.com>
Date: Fri, 27 May 2016 19:18:49 +0000 (-0400)
Subject: [dev.ssa] Merge branch 'master' into dev.ssa
X-Git-Tag: go1.8beta1~1892^2^2~66
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=31e13c83c26c5addad6c9a15a8f06a11edc7c519;p=gostls13.git

[dev.ssa] Merge branch 'master' into dev.ssa

Change-Id: Iabc80b6e0734efbd234d998271e110d2eaad41dd
---

31e13c83c26c5addad6c9a15a8f06a11edc7c519
diff --cc src/cmd/compile/internal/ssa/config.go
index 26f16bae58,e8ab17806c..ddb58d9f79
--- a/src/cmd/compile/internal/ssa/config.go
+++ b/src/cmd/compile/internal/ssa/config.go
@@@ -13,19 -14,19 +14,20 @@@ import 
  )
  
  type Config struct {
- 	arch         string                     // "amd64", etc.
- 	IntSize      int64                      // 4 or 8
- 	PtrSize      int64                      // 4 or 8
- 	lowerBlock   func(*Block) bool          // lowering function
- 	lowerValue   func(*Value, *Config) bool // lowering function
- 	registers    []Register                 // machine registers
- 	flagRegMask  regMask                    // flag register mask
- 	fe           Frontend                   // callbacks into compiler frontend
- 	HTML         *HTMLWriter                // html writer, for debugging
- 	ctxt         *obj.Link                  // Generic arch information
- 	optimize     bool                       // Do optimization
- 	noDuffDevice bool                       // Don't use Duff's device
- 	curFunc      *Func
+ 	arch            string                     // "amd64", etc.
+ 	IntSize         int64                      // 4 or 8
+ 	PtrSize         int64                      // 4 or 8
+ 	lowerBlock      func(*Block) bool          // lowering function
+ 	lowerValue      func(*Value, *Config) bool // lowering function
+ 	registers       []Register                 // machine registers
++	flagRegMask     regMask                    // flag register mask
+ 	fe              Frontend                   // callbacks into compiler frontend
+ 	HTML            *HTMLWriter                // html writer, for debugging
+ 	ctxt            *obj.Link                  // Generic arch information
+ 	optimize        bool                       // Do optimization
+ 	noDuffDevice    bool                       // Don't use Duff's device
+ 	sparsePhiCutoff uint64                     // Sparse phi location algorithm used above this #blocks*#variables score
+ 	curFunc         *Func
  
  	// TODO: more stuff. Compiler flags of interest, ...