some array init bugs

renamed 6g/(gen|align|obj).c

R=r
OCL=29205
CL=29205

1 files changed, 6 insertions, 3 deletions

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 8b4fc40f2..e20f0c75c 100644
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -3970,9 +3970,11 @@ structlit(Node *n, Node *var)
 	r = listfirst(&saver, &n->left);
 	if(r != N && r->op == OEMPTY)
 		r = N;
+	if(r == N)
+		return var;
 
 	mixflag = 0;
-	if(r != N && r->op == OKEY) {
+	if(r->op == OKEY) {
 		a = nod(OAS, var, N);
 		addtop = list(addtop, a);
 		goto loop2;
@@ -4050,11 +4052,11 @@ arraylit(Node *n, Node *var)
 		r = N;
 
 	while(r != N) {
-		b++;
 		if(r->op == OKEY) {
 			evconst(r->left);
 			b = nonnegconst(r->left);
 		}
+		b++;
 		if(b > ninit)
 			ninit = b;
 		r = listnext(&saver);
@@ -4064,7 +4066,8 @@ arraylit(Node *n, Node *var)
 	if(b == -100) {
 		// flag for [...]
 		b = ninit;
-		t = shallow(t);
+		if(var == N)
+			t = shallow(t);
 		t->bound = b;
 	}