From 21ef207889122448cf008accb688b118d987da79 Mon Sep 17 00:00:00 2001
From: Ken Thompson <ken@golang.org>
Date: Fri, 29 Aug 2008 13:24:53 -0700
Subject: fix type of (1<<x)

R=r
OCL=14656
CL=14656
---
 src/cmd/gc/const.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/cmd/gc/const.c')

diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c
index 90eaff269..f8c6acbc0 100644
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -11,9 +11,19 @@ convlit(Node *n, Type *t)
 	int et;
 	Node *n1;
 
-	if(n == N || n->op != OLITERAL || t == T)
+	if(n == N || t == T)
 		return;
-
+	switch(n->op) {
+	default:
+		return;
+	case OLITERAL:
+		break;
+	case OLSH:
+	case ORSH:
+		convlit(n->left, t);
+		n->type = n->left->type;
+		return;
+	}
 	et = t->etype;
 	switch(whatis(n)) {
 	default:
-- 
cgit v1.2.3