---

yaml
---
r: 22988
b: refs/heads/master
c: edfc79c
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f23674394f2e77b7aa4686a5ae9f2f60d6faa428
+refs/heads/master: edfc79cc4798798ecaf4e7fead54dd2e1c3e703e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/check_const.rs

@@ -66,10 +66,7 @@ fn check_expr(sess: session, def_map: resolve3::DefMap,
                           ~"disallowed operator in constant expression");
             return;
           }
-          expr_lit(@{node: lit_str(_), _}) {
-            sess.span_err(e.span,
-                          ~"string constants are not supported");
-          }
+          expr_lit(@{node: lit_str(_), _}) { }
           expr_binary(_, _, _) | expr_unary(_, _) {
             if method_map.contains_key(e.id) {
                 sess.span_err(e.span, ~"user-defined operators are not \
@@ -101,6 +98,9 @@ fn check_expr(sess: session, def_map: resolve3::DefMap,
               }
             }
           }
+          expr_vstore(_, vstore_slice(_)) |
+          expr_vstore(_, vstore_fixed(_)) |
+          expr_vec(_, m_imm) |
           expr_addr_of(m_imm, _) |
           expr_tup(*) |
           expr_rec(*) { }

trunk/src/rustc/middle/trans/consts.rs

@@ -25,21 +25,29 @@ fn const_lit(cx: @crate_ctxt, e: @ast::expr, lit: ast::lit)
       ast::lit_float(fs, t) { C_floating(*fs, T_float_ty(cx, t)) }
       ast::lit_bool(b) { C_bool(b) }
       ast::lit_nil { C_nil() }
-      ast::lit_str(s) {
-        cx.sess.span_unimpl(lit.span, ~"unique string in this context");
-      }
+      ast::lit_str(s) { C_estr_slice(cx, *s) }
     }
 }
 
 // FIXME (#2530): this should do some structural hash-consing to avoid
 // duplicate constants. I think. Maybe LLVM has a magical mode that does so
 // later on?
+
+fn const_vec_and_sz(cx: @crate_ctxt, e: @ast::expr, es: &[@ast::expr])
+    -> (ValueRef, ValueRef) {
+    let vec_ty = ty::expr_ty(cx.tcx, e);
+    let unit_ty = ty::sequence_element_type(cx.tcx, vec_ty);
+    let llunitty = type_of::type_of(cx, unit_ty);
+    let v = C_array(llunitty, es.map(|e| const_expr(cx, e)));
+    let unit_sz = shape::llsize_of(cx, llunitty);
+    let sz = llvm::LLVMConstMul(C_uint(cx, es.len()), unit_sz);
+    return (v, sz);
+}
+
 fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
     let _icx = cx.insn_ctxt(~"const_expr");
     alt e.node {
       ast::expr_lit(lit) { consts::const_lit(cx, e, *lit) }
-      // If we have a vstore, just keep going; it has to be a string
-      ast::expr_vstore(e, _) { const_expr(cx, e) }
       ast::expr_binary(b, e1, e2) {
         let te1 = const_expr(cx, e1);
         let te2 = const_expr(cx, e2);
@@ -147,6 +155,37 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
       ast::expr_rec(fs, none) {
         C_struct(fs.map(|f| const_expr(cx, f.node.expr)))
       }
+      ast::expr_vec(es, m_imm) {
+        let (v, _) = const_vec_and_sz(cx, e, es);
+        v
+      }
+      ast::expr_vstore(e, ast::vstore_fixed(_)) {
+        const_expr(cx, e)
+      }
+      ast::expr_vstore(sub, ast::vstore_slice(_)) {
+        alt sub.node {
+          ast::expr_lit(lit) {
+            alt lit.node {
+              ast::lit_str(*) => { const_expr(cx, sub) }
+              _ => { cx.sess.span_bug(e.span,
+                                      ~"bad const-slice lit") }
+            }
+          }
+          ast::expr_vec(es, m_imm) => {
+            let (cv, sz) = const_vec_and_sz(cx, e, es);
+            let subty = ty::expr_ty(cx.tcx, sub),
+            llty = type_of::type_of(cx, subty);
+            let gv = do str::as_c_str("const") |name| {
+                llvm::LLVMAddGlobal(cx.llmod, llty, name)
+            };
+            llvm::LLVMSetInitializer(gv, cv);
+            llvm::LLVMSetGlobalConstant(gv, True);
+            C_struct(~[gv, sz])
+          }
+          _ => cx.sess.span_bug(e.span,
+                                ~"bad const-slice expr")
+        }
+      }
       ast::expr_path(path) {
         alt cx.tcx.def_map.find(e.id) {
           some(ast::def_const(def_id)) {

trunk/src/test/run-pass/const-region-ptrs.rs

@@ -4,6 +4,8 @@ const x: &int = &10;
 const y: &{a: int, b: &int} = &{a: 15, b: x};
 
 fn main() {
-    io::println(fmt!("x = %?", x));
+    io::println(fmt!("x = %?", *x));
     io::println(fmt!("y = {a: %?, b: %?}", y.a, *(y.b)));
+    assert *x == 10;
+    assert *(y.b) == 10;
 }

trunk/src/test/run-pass/const-vecs-and-slices.rs

@@ -0,0 +1,7 @@
+const x : [int]/4 = [1,2,3,4];
+
+fn main() {
+    io::println(fmt!("%?", x[1]));
+    assert x[1] == 2;
+    assert x[3] == 4;
+}