From 3b37b0283491582db7154352ea779b5d2b7ef332 Mon Sep 17 00:00:00 2001
From: Ken Thompson <ken@golang.org>
Date: Fri, 29 May 2009 13:44:30 -0700
Subject: [PATCH] bug 149

R=r
OCL=29612
CL=29612
---
 src/cmd/gc/const.c                 | 5 ++++-
 test/{bugs => fixedbugs}/bug149.go | 0
 test/golden.out                    | 6 ------
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename test/{bugs => fixedbugs}/bug149.go (100%)

diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c
index d672ec9f09..147af4fe39 100644
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -83,7 +83,6 @@ convlit1(Node *n, Type *t, int explicit)
 		n->type = n->left->type;
 		return;
 	}
-
 	// avoided repeated calculations, errors
 	if(cvttype(n->type, t)) {
 		n->type = t;
@@ -127,6 +126,10 @@ convlit1(Node *n, Type *t, int explicit)
 		default:
 			goto bad;
 
+		case TSTRING:
+			// let normal conversion code handle it
+			return;
+
 		case TPTR32:
 		case TPTR64:
 		case TINTER:
diff --git a/test/bugs/bug149.go b/test/fixedbugs/bug149.go
similarity index 100%
rename from test/bugs/bug149.go
rename to test/fixedbugs/bug149.go
diff --git a/test/golden.out b/test/golden.out
index 6bc8837d49..b5dbddffe6 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -104,10 +104,6 @@ BUG should compile
 5 7
 BUG: should crash
 
-=========== bugs/bug149.go
-bugs/bug149.go:14: cannot convert []uint8 constant to string
-BUG: should compile
-
 =========== fixedbugs/bug016.go
 fixedbugs/bug016.go:7: constant -3 overflows uint
 
@@ -142,7 +138,6 @@ fixedbugs/bug039.go:6: variable x redeclared in this block
 fixedbugs/bug041.go:5: export of incomplete type t
 
 =========== fixedbugs/bug049.go
-fixedbugs/bug049.go:6: cannot convert nil constant to string
 fixedbugs/bug049.go:6: illegal types for operand: EQ
 	string
 	nil
@@ -154,7 +149,6 @@ fixedbugs/bug050.go:3: package statement must be first
 fixedbugs/bug051.go:10: expression must be a constant
 
 =========== fixedbugs/bug062.go
-fixedbugs/bug062.go:6: cannot convert nil constant to string
 fixedbugs/bug062.go:6: illegal types for operand: AS
 	string
 	nil