---

msullivan · msullivan · commit 596df1e35781 · 2012-05-30T15:03:24.000-07:00
yaml --- r: 13114 b: refs/heads/master c: 7fee392 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ccb54f0ce0002667fbda58cc8bafd356b39e8671
+refs/heads/master: 7fee392de5e977038d233861d5d619164f96f338
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/const_eval.rs b/trunk/src/rustc/middle/const_eval.rs
@@ -49,7 +49,6 @@ fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {
               le { fromb(a <= b) } ne { fromb(a != b) }
               ge { fromb(a >= b) } gt { fromb(a > b) }
             }
-
           }
           (const_uint(a), const_uint(b)) {
             alt check op {
@@ -63,6 +62,17 @@ fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {
               ge { fromb(a >= b) } gt { fromb(a > b) }
             }
           }
+          // shifts can have any integral type as their rhs
+          (const_int(a), const_uint(b)) {
+            alt check op {
+              shl { const_int(a << b) } shr { const_int(a >> b) }
+            }
+          }
+          (const_uint(a), const_int(b)) {
+            alt check op {
+              shl { const_uint(a << b) } shr { const_uint(a >> b) }
+            }
+          }
         }
       }
       expr_cast(base, _) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {`
`49`	`49`	`le { fromb(a <= b) } ne { fromb(a != b) }`
`50`	`50`	`ge { fromb(a >= b) } gt { fromb(a > b) }`
`51`	`51`	`}`
`52`		`-`
`53`	`52`	`}`
`54`	`53`	`(const_uint(a), const_uint(b)) {`
`55`	`54`	`alt check op {`
`@@ -63,6 +62,17 @@ fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {`
`63`	`62`	`ge { fromb(a >= b) } gt { fromb(a > b) }`
`64`	`63`	`}`
`65`	`64`	`}`
	`65`	`+ // shifts can have any integral type as their rhs`
	`66`	`+ (const_int(a), const_uint(b)) {`
	`67`	`+ alt check op {`
	`68`	`+ shl { const_int(a << b) } shr { const_int(a >> b) }`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+ (const_uint(a), const_int(b)) {`
	`72`	`+ alt check op {`
	`73`	`+ shl { const_uint(a << b) } shr { const_uint(a >> b) }`
	`74`	`+ }`
	`75`	`+ }`
`66`	`76`	`}`
`67`	`77`	`}`
`68`	`78`	`expr_cast(base, _) {`