diff -r 22109b5daced sys/src/cmd/cc/cc.h --- a/sys/src/cmd/cc/cc.h Wed Feb 26 21:45:00 2020 -0800 +++ b/sys/src/cmd/cc/cc.h Wed Feb 26 23:29:43 2020 -0800 @@ -691,6 +691,7 @@ void typeext(Type*, Node*); void typeext1(Type*, Node*); int side(Node*); +int zpconst(Node*); int vconst(Node*); int log2(uvlong); int vlog(Node*); diff -r 22109b5daced sys/src/cmd/cc/com.c --- a/sys/src/cmd/cc/com.c Wed Feb 26 21:45:00 2020 -0800 +++ b/sys/src/cmd/cc/com.c Wed Feb 26 23:29:43 2020 -0800 @@ -341,11 +341,13 @@ o |= tcom(r->left); if(o | tcom(r->right)) goto bad; - if(r->right->type->etype == TIND && vconst(r->left) == 0) { + if(r->right->type->etype == TIND && zpconst(r->left)) { + r->type = r->right->type; r->left->type = r->right->type; r->left->vconst = 0; } - if(r->left->type->etype == TIND && vconst(r->right) == 0) { + if(r->left->type->etype == TIND && zpconst(r->right)) { + r->type = r->left->type; r->right->type = r->left->type; r->right->vconst = 0; } diff -r 22109b5daced sys/src/cmd/cc/sub.c --- a/sys/src/cmd/cc/sub.c Wed Feb 26 21:45:00 2020 -0800 +++ b/sys/src/cmd/cc/sub.c Wed Feb 26 23:29:43 2020 -0800 @@ -1026,6 +1026,21 @@ } int +zpconst(Node *n) +{ + while(n->op == OCAST){ + if(n->type == T) + break; + if(n->type->etype != TIND) + break; + if(n->type->link->etype != TVOID) + break; + n = n->left; + } + return vconst(n) == 0; +} + +int vconst(Node *n) { int i;