[dev.power64] code review 160200044: build: merge default into dev.power64

src/cmd/cc/dcl.c

 // Inferno utils/cc/dcl.c
 // http://code.google.com/p/inferno-os/source/browse/utils/cc/dcl.c
 //
 //      Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 //      Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 //      Portions Copyright © 1997-1999 Vita Nuova Limited
 //      Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 //      Portions Copyright © 2004,2006 Bruce Ellis
 //      Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 //      Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
@@ skipping 679 matching lines @@
 }
 
 #define ANSIPROTO       1
 #define OLDPROTO        2
 
 void
 argmark(Node *n, int pass)
 {
         Type *t;
 
-        autoffset = align(0, thisfn->link, Aarg0, nil);
+        if(hasdotdotdot(thisfn->link))
+                autoffset = align(0, thisfn->link, Aarg0, nil);
         stkoff = 0;
         for(; n->left != Z; n = n->left) {
                 if(n->op != OFUNC || n->left->op != ONAME)
                         continue;
                 walkparam(n->right, pass);
                 if(pass != 0 && anyproto(n->right) == OLDPROTO) {
                         t = typ(TFUNC, n->left->sym->type->link);
                         t->down = typ(TOLD, T);
                         t->down->down = ofnproto(n->right);
                         tmerge(t, n->left->sym);
@@ skipping 683 matching lines @@
                         c = CSTATIC;
                 }
         if(s->type != T)
                 if(s->class != c || !sametype(t, s->type) || t->etype == TENUM) {
                         diag(Z, "external redeclaration of: %s", s->name);
                         Bprint(&diagbuf, "      %s %T %L\n", cnames[c], t, nearln);
                         Bprint(&diagbuf, "      %s %T %L\n", cnames[s->class], s->type, s->varlineno);
                 }
         tmerge(t, s);
         s->type = t;
+        if(c == CTYPEDEF && (typechlv[t->etype] || typefd[t->etype])) {
+                s->type = copytyp(t);
+                s->type->tag = s;
+        }
         s->class = c;
         s->block = 0;
         s->offset = o;
 }
 
 void
 tmerge(Type *t1, Sym *s)
 {
         Type *ta, *tb, *t2;
 
@@ skipping 60 matching lines @@
                 t1 = t1->link;
                 t2 = t2->link;
         }
 }
 
 void
 edecl(int c, Type *t, Sym *s)
 {
         Type *t1;
 
-        if(s == S) {
-                if(!typesu[t->etype])
-                        diag(Z, "unnamed structure element must be struct/union");
-                if(c != CXXX)
-                        diag(Z, "unnamed structure element cannot have class");
-        } else
+        if(s == S)
+                diag(Z, "unnamed structure elements not supported");
+        else
                 if(c != CXXX)
                         diag(Z, "structure element cannot have class: %s", s->name);
         t1 = t;
         t = copytyp(t1);
         t->sym = s;
         t->down = T;
         if(lastfield) {
                 t->shift = lastbit - lastfield;
                 t->nbits = lastfield;
                 if(firstbit)
@@ skipping 193 matching lines @@
         q = new(OADDR, q, 0);
 
         q = new(OASI, p, q);
         r = new(OLIST, q, r);
 
         n = new(OLIST, r, n);
 
 no:
         return n;
 }