SVN=123249

504aa698 · Ken Thompson · 53ec6500 · 504aa698
Commit 504aa698 authored Jun 18, 2008 by Ken Thompson
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

const.c src/cmd/gc/const.c +9 -5

No files found.
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -9,17 +9,21 @@ void
 convlit(Node *n, Type *t)
 {
 	int et;
+	Node *n1;

 	if(n == N || n->op != OLITERAL || t == T)
 		return;

-	if(t->etype == TANY || isptrto(t, TANY)) {
-		defaultlit(n);
-		return;
-	}
-
 	et = t->etype;
 	switch(whatis(n)) {
+	default:
+		goto bad1;
+
+	case Wlitnil:
+		if(isptr[et] || et = TINTER)
+			break;
+		goto bad1;
+
 	case Wlitint:
 		if(isptrto(t, TSTRING)) {
 			Rune rune;