From: Dave Cheney <dave@cheney.net>
Date: Wed, 13 Mar 2013 20:12:38 +0000 (-0400)
Subject: cmd/gc: silence valgrind error
X-Git-Tag: go1.1rc2~524
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8883c484cf42b2addb8559e2a4e24383b5c083d1;p=gostls13.git

cmd/gc: silence valgrind error

valgrind complained that under some circumstances,

    *nr = *nc

was being called when nr and nc were the same *Node. The suggestion my Rémy was to introduce a tmp node to avoid the potential for aliasing in subnode.

R=remyoudompheng, minux.ma, rsc
CC=golang-dev
https://golang.org/cl/7780044
---

diff --git a/src/cmd/gc/cplx.c b/src/cmd/gc/cplx.c
index e0127fc59a..c9bab7a768 100644
--- a/src/cmd/gc/cplx.c
+++ b/src/cmd/gc/cplx.c
@@ -36,7 +36,7 @@ void
 complexmove(Node *f, Node *t)
 {
 	int ft, tt;
-	Node n1, n2, n3, n4;
+	Node n1, n2, n3, n4, tmp;
 
 	if(debug['g']) {
 		dump("\ncomplexmove-f", f);
@@ -62,9 +62,9 @@ complexmove(Node *f, Node *t)
 		// make f addable.
 		// also use temporary if possible stack overlap.
 		if(!f->addable || overlap(f, t)) {
-			tempname(&n1, f->type);
-			complexmove(f, &n1);
-			f = &n1;
+			tempname(&tmp, f->type);
+			complexmove(f, &tmp);
+			f = &tmp;
 		}
 
 		subnode(&n1, &n2, f);