Potential solution to Issue golang#17449.

JayNakrani · JayNakrani · commit 7b1b24d58da6 · 2016-10-16T18:12:01.000-07:00
Change-Id: I1fb8759057f6ef1c97b55330a1bc833e20957cc5
diff --git a/src/cmd/compile/internal/gc/racewalk.go b/src/cmd/compile/internal/gc/racewalk.go
@@ -174,15 +174,10 @@ func instrumentnode(np **Node, init *Nodes, wr int, skip int) {
 				}
 			default:
 				var outn Nodes
-				outn.Set(out)
 				instrumentnode(&ls[i], &outn, 0, 0)
-				if ls[i].Op != OAS && ls[i].Op != OASWB && ls[i].Op != OAS2FUNC || ls[i].Ninit.Len() == 0 {
-					out = append(outn.Slice(), ls[i])
-				} else {
-					// Splice outn onto end of ls[i].Ninit
-					ls[i].Ninit.AppendNodes(&outn)
-					out = append(out, ls[i])
-				}
+				// Splice outn onto end of ls[i].Ninit
+				ls[i].Ninit.AppendNodes(&outn)
+				out = append(out, ls[i])
 			}
 		}
 		n.List.Set(out)

Original file line number	Diff line number	Diff line change
`@@ -174,15 +174,10 @@ func instrumentnode(np *Node, init Nodes, wr int, skip int) {`
`174`	`174`	`}`
`175`	`175`	`default:`
`176`	`176`	`var outn Nodes`
`177`		`- outn.Set(out)`
`178`	`177`	`instrumentnode(&ls[i], &outn, 0, 0)`
`179`		`- if ls[i].Op != OAS && ls[i].Op != OASWB && ls[i].Op != OAS2FUNC \|\| ls[i].Ninit.Len() == 0 {`
`180`		`- out = append(outn.Slice(), ls[i])`
`181`		`- } else {`
`182`		`- // Splice outn onto end of ls[i].Ninit`
`183`		`- ls[i].Ninit.AppendNodes(&outn)`
`184`		`- out = append(out, ls[i])`
`185`		`- }`
	`178`	`+ // Splice outn onto end of ls[i].Ninit`
	`179`	`+ ls[i].Ninit.AppendNodes(&outn)`
	`180`	`+ out = append(out, ls[i])`
`186`	`181`	`}`
`187`	`182`	`}`
`188`	`183`	`n.List.Set(out)`