From: Ken Thompson <ken@golang.org>
Date: Fri, 28 Aug 2009 20:45:48 +0000 (-0700)
Subject: sliceslice bug
X-Git-Tag: weekly.2009-11-06~723
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3983171b085f523296ef3cb99c6873145ad6312a;p=gostls13.git

sliceslice bug

R=rsc
OCL=34050
CL=34050
---

diff --git a/src/cmd/6g/ggen.c b/src/cmd/6g/ggen.c
index 3e7cc30fc0..acbb303210 100644
--- a/src/cmd/6g/ggen.c
+++ b/src/cmd/6g/ggen.c
@@ -1243,7 +1243,6 @@ sleasy(Node *n)
 		return 0;
 	if(!n->addable)
 		return 0;
-return 0;
 	return 1;
 }
 
@@ -1349,42 +1348,42 @@ slicearray:
 
 sliceslice:
 	getargs(n->list, nodes, 4);
-	if(!sleasy(&nodes[0])) {
+	if(!sleasy(nodes+0)) {
 		for(i=0; i<4; i++) {
-			if(nodes[i].op == OREGISTER)
-				regfree(&nodes[i]);
+			if((nodes+i)->op == OREGISTER)
+				regfree(nodes+i);
 		}
 		goto no;
 	}
 
 	// if(hb[2] > old.cap[0]) goto throw;
-	n2 = nodes[0];
+	n2 = *(nodes+0);
 	n2.xoffset += Array_cap;
 	cmpandthrow(nodes+2, &n2);
 
 	// if(lb[1] > hb[2]) goto throw;
-	cmpandthrow(&nodes[1], &nodes[2]);
+	cmpandthrow(nodes+1, nodes+2);
 
 	// ret.len = hb[2]-lb[1]; (destroys hb[2])
 	n2 = *res;
 	n2.xoffset += Array_nel;
 
-	if(smallintconst(&nodes[2]) && smallintconst(&nodes[1])) {
+	if(smallintconst(nodes+2) && smallintconst(nodes+1)) {
 		v = mpgetfix((nodes+2)->val.u.xval) -
-			mpgetfix(nodes[2].val.u.xval);
+			mpgetfix((nodes+1)->val.u.xval);
 		nodconst(&n1, types[TUINT32], v);
 		gins(optoas(OAS, types[TUINT32]), &n1, &n2);
 	} else {
 		regalloc(&n1, types[TUINT32], nodes+2);
 		gmove(nodes+2, &n1);
-		if(!smallintconst(&nodes[1]) || mpgetfix(nodes[1].val.u.xval) != 0)
-			gins(optoas(OSUB, types[TUINT32]), &nodes[1], &n1);
+		if(!smallintconst(nodes+1) || mpgetfix((nodes+1)->val.u.xval) != 0)
+			gins(optoas(OSUB, types[TUINT32]), nodes+1, &n1);
 		gins(optoas(OAS, types[TUINT32]), &n1, &n2);
 		regfree(&n1);
 	}
 
 	// ret.cap = old.cap[0]-lb[1]; (uses hb[2])
-	n2 = nodes[0];
+	n2 = *(nodes+0);
 	n2.xoffset += Array_cap;
 
 	regalloc(&n1, types[TUINT32], nodes+2);
@@ -1397,8 +1396,8 @@ sliceslice:
 	gins(optoas(OAS, types[TUINT32]), &n1, &n2);
 	regfree(&n1);
 
-	// ret.array = old.array[0]+lb[1]*width[3]; (uses lb)
-	n2 = nodes[0];
+	// ret.array = old.array[0]+lb[1]*width[3]; (uses lb[1])
+	n2 = *(nodes+0);
 	n2.xoffset += Array_array;
 
 	regalloc(&n1, types[tptr], nodes+1);