---

yaml
---
r: 44276
b: refs/heads/snap-stage3
c: f0d0b5c
h: refs/heads/master
v: v3

Author: youknowone

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f9f942bb142a36ce4c94181ae8d7f8dcf4160700
+refs/heads/snap-stage3: f0d0b5c116eb464544bd48cec116c1ec8908d04d
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -4289,7 +4289,8 @@ pub fn eval_repeat_count(tcx: ctxt,
                          count_expr: @ast::expr,
                          span: span)
                       -> uint {
-    match const_eval::eval_const_expr(tcx, count_expr) {
+    match const_eval::eval_const_expr_partial(tcx, count_expr) {
+      Ok(ref const_val) => match *const_val {
         const_eval::const_int(count) => return count as uint,
         const_eval::const_uint(count) => return count as uint,
         const_eval::const_float(count) => {
@@ -4310,7 +4311,13 @@ pub fn eval_repeat_count(tcx: ctxt,
                                 repeat count but found boolean");
             return 0;
         }
-
+      },
+      Err(*) => {
+        tcx.sess.span_err(span,
+                          ~"expected constant integer for repeat count \
+                            but found variable");
+        return 0;
+      }
     }
 }
 

branches/snap-stage3/src/test/compile-fail/repeat_count.rs

@@ -0,0 +1,16 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Regression test for issue #3645
+
+fn main() {
+    let n = 1;
+    let a = ~[0, ..n]; //~ ERROR expected constant integer for repeat count but found variable
+}