code review 152700045: cmd/gc: don't use static init to initialize small struc...

src/cmd/gc/sinit.c

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 /*
  * static initialization
  */
 
 #include        <u.h>
 #include        <libc.h>
@@ skipping 1049 matching lines @@
 
                 var = nod(OIND, var, N);
                 typecheck(&var, Erv | Easgn);
                 anylit(ctxt, n->left, var, init);
                 break;
 
         case OSTRUCTLIT:
                 if(t->etype != TSTRUCT)
                         fatal("anylit: not struct");
 
-                if(simplename(var)) {
+                if(simplename(var) && count(n->list) > 4) {
 
                         if(ctxt == 0) {
                                 // lay out static data
                                 vstat = staticname(t, ctxt);
                                 structlit(ctxt, 1, n, vstat, init);
 
                                 // copy static to var
                                 a = nod(OAS, var, vstat);
                                 typecheck(&a, Etop);
                                 walkexpr(&a, init);
                                 *init = list(*init, a);
 
                                 // add expressions to automatic
                                 structlit(ctxt, 2, n, var, init);
                                 break;
                         }
                         structlit(ctxt, 1, n, var, init);
                         structlit(ctxt, 2, n, var, init);
                         break;
                 }
 
                 // initialize of not completely specified
-                if(count(n->list) < structcount(t)) {
+                if(simplename(var) || count(n->list) < structcount(t)) {
                         a = nod(OAS, var, N);
                         typecheck(&a, Etop);
                         walkexpr(&a, init);
                         *init = list(*init, a);
                 }
                 structlit(ctxt, 3, n, var, init);
                 break;
 
         case OARRAYLIT:
                 if(t->etype != TARRAY)
                         fatal("anylit: not array");
                 if(t->bound < 0) {
                         slicelit(ctxt, n, var, init);
                         break;
                 }
 
-                if(simplename(var)) {
+                if(simplename(var) && count(n->list) > 4) {
 
                         if(ctxt == 0) {
                                 // lay out static data
                                 vstat = staticname(t, ctxt);
                                 arraylit(1, 1, n, vstat, init);
 
                                 // copy static to automatic
                                 a = nod(OAS, var, vstat);
                                 typecheck(&a, Etop);
                                 walkexpr(&a, init);
                                 *init = list(*init, a);
 
                                 // add expressions to automatic
                                 arraylit(ctxt, 2, n, var, init);
                                 break;
                         }
                         arraylit(ctxt, 1, n, var, init);
                         arraylit(ctxt, 2, n, var, init);
                         break;
                 }
 
                 // initialize of not completely specified
-                if(count(n->list) < t->bound) {
+                if(simplename(var) || count(n->list) < t->bound) {
                         a = nod(OAS, var, N);
                         typecheck(&a, Etop);
                         walkexpr(&a, init);
                         *init = list(*init, a);
                 }
                 arraylit(ctxt, 3, n, var, init);
                 break;
 
         case OMAPLIT:
                 if(t->etype != TMAP)
@@ skipping 352 matching lines @@
                 if(p->cap == 0)
                         p->cap = 4;
                 else
                         p->cap *= 2;
                 p->e = realloc(p->e, p->cap*sizeof p->e[0]);
                 if(p->e == nil)
                         fatal("out of memory");
         }
         return &p->e[p->len++];
 }