From 3ea8d854a3a0b7f812d8590d4d1c3c2671288b60 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 16 Apr 2009 23:07:30 -0700 Subject: [PATCH] make string(array) take []byte only (and thus *[10]byte but not [10]byte) R=ken OCL=27581 CL=27585 --- src/cmd/gc/walk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c index 1fa07dec03b..f64ada8a483 100644 --- a/src/cmd/gc/walk.c +++ b/src/cmd/gc/walk.c @@ -1230,8 +1230,9 @@ walkconv(Node *n) indir(n, stringop(n, Erv)); return; } - if(et == TARRAY) - if(istype(l->type->type, TUINT8)) { + // can convert []byte and *[10]byte + if((isptr[et] && isfixedarray(l->type->type) && istype(l->type->type->type, TUINT8)) + || (isslice(l->type) && istype(l->type->type, TUINT8))) { n->op = OARRAY; indir(n, stringop(n, Erv)); return; @@ -1267,6 +1268,9 @@ walkconv(Node *n) } bad: + if(n->diag) + return; + n->diag = 1; if(l->type != T) yyerror("invalid conversion: %T to %T", l->type, t); else @@ -2204,8 +2208,6 @@ stringop(Node *n, int top) case OARRAY: // arraystring([]byte) string; r = n->left; - if(isfixedarray(r->type)) - r = nod(OADDR, r, N); on = syslook("arraystring", 0); r = nod(OCALL, on, r); break;