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

[gostls13.git] / src / cmd / compile / internal / ssa / regalloc.go

diff --git a/src/cmd/compile/internal/ssa/regalloc.go b/src/cmd/compile/internal/ssa/regalloc.go
index 1eecd49c40cf3a322628f5a4419667fd32917ef8..8603615f251720f54a1f98ad467f240843717300 100644 (file)
--- a/src/cmd/compile/internal/ssa/regalloc.go
+++ b/src/cmd/compile/internal/ssa/regalloc.go
@@ -1002,7 +1002,7 @@ func (s *regAllocState) regalloc(f *Func) {
                        args = append(args[:0], v.Args...)
                        for _, i := range regspec.inputs {
                                mask := i.regs
-                               if mask == flagRegMask {
+                               if mask == f.Config.flagRegMask {
                                        // TODO: remove flag input from regspec.inputs.
                                        continue
                                }