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

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

diff --git a/src/cmd/compile/internal/ssa/opGen.go b/src/cmd/compile/internal/ssa/opGen.go
index 558d041624a1310f647e5e6306da0858dfef2aa7..fc8214b9d9263e470955c4c07c15220c05879431 100644 (file)
--- a/src/cmd/compile/internal/ssa/opGen.go
+++ b/src/cmd/compile/internal/ssa/opGen.go
@@ -674,6 +674,7 @@ const (
        OpVarDef
        OpVarKill
        OpVarLive
+       OpKeepAlive
 )
 
 var opcodeTable = [...]opInfo{
@@ -6167,6 +6168,7 @@ var opcodeTable = [...]opInfo{
        },
        {
                name:    "FwdRef",
+               auxType: auxSym,
                argLen:  0,
                generic: true,
        },
@@ -6193,6 +6195,11 @@ var opcodeTable = [...]opInfo{
                argLen:  1,
                generic: true,
        },
+       {
+               name:    "KeepAlive",
+               argLen:  2,
+               generic: true,
+       },
 }
 
 func (o Op) Asm() obj.As    { return opcodeTable[o].asm }