bug086

R=r
OCL=26090
CL=26090

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index d82dfd4ebf09065ac1ecebb91a776de277ad7fcc..6c93c11cfe1a68f9cb13658e58f631592c27a0bf 100644 (file)
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -733,7 +733,6 @@ loop:
                        goto nottop;
                walktype(n->left, Erv);
                implicitstar(&n->left);
-               evconst(n);
                t = n->left->type;
                if(t == T)
                        goto ret;
@@ -741,6 +740,9 @@ loop:
                default:
                        goto badt;
                case TSTRING:
+                       if(whatis(n->left) == Wlitstr)
+                               nodconst(n, types[TINT], n->left->val.u.sval->len);
+                       break;
                case TMAP:
                        break;
                case TARRAY:

diff --git a/test/bugs/bug087.go b/test/fixedbugs/bug087.go
similarity index 100%
rename from test/bugs/bug087.go
rename to test/fixedbugs/bug087.go

diff --git a/test/golden.out b/test/golden.out
index 31616f4faa46bb3604606bb712278e54f691cb30..5dfe1953aaca5819582b92abb4a060b2e2333579 100644 (file)
--- a/test/golden.out
+++ b/test/golden.out
@@ -115,11 +115,6 @@ abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz
 =========== chan/nonblock.go
 PASS
 
-=========== bugs/bug087.go
-bugs/bug087.go:8: illegal combination of literals LEN 9
-bugs/bug087.go:8: illegal combination of literals LEN 9
-BUG: fails incorrectly
-
 =========== bugs/bug108.go
 bugs/bug108.go:4: stupid shift: 1025
 BUG: errchk: command succeeded unexpectedly:  6g bugs/bug108.go