---

yaml
---
r: 22476
b: refs/heads/master
c: c84c4a8
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2ea9c8df0f7c9ee72913883128b37d0a80d2f4f6
+refs/heads/master: c84c4a8d71914b5bc0cb3546158bc053aacb7a96
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/check_const.rs

@@ -37,7 +37,12 @@ fn check_item(sess: session, ast_map: ast_map::map, def_map: resolve::def_map,
 
 fn check_pat(p: @pat, &&_is_const: bool, v: visit::vt<bool>) {
     fn is_str(e: @expr) -> bool {
-        alt e.node { expr_lit(@{node: lit_str(_), _}) { true } _ { false } }
+        alt e.node {
+          expr_lit(@{node: lit_str(_), _}) |
+          expr_vstore(@{node: expr_lit(@{node: lit_str(_), _}), _},
+                      vstore_uniq) { true }
+          _ { false }
+        }
     }
     alt p.node {
       // Let through plain string literals here

trunk/src/rustc/middle/const_eval.rs

@@ -103,6 +103,8 @@ fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {
         }
       }
       expr_lit(lit) { lit_to_const(lit) }
+      // If we have a vstore, just keep going; it has to be a string
+      expr_vstore(e, _) { eval_const_expr(tcx, e) }
     }
 }
 

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

@@ -47,7 +47,10 @@ fn trans_opt(bcx: block, o: opt) -> opt_result {
     alt o {
       lit(l) {
         alt l.node {
-          ast::expr_lit(@{node: ast::lit_str(s), _}) {
+          ast::expr_lit(@{node: ast::lit_str(s), _}) |
+          ast::expr_vstore(@{node: ast::expr_lit(
+              @{node: ast::lit_str(s), _}), _},
+                           ast::vstore_uniq) {
             let strty = ty::mk_str(bcx.tcx());
             let cell = empty_dest_cell();
             bcx = tvec::trans_estr(bcx, s, ast::vstore_uniq, by_val(cell));

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

@@ -4613,7 +4613,9 @@ fn trans_enum_variant(ccx: @crate_ctxt, enum_id: ast::node_id,
 fn trans_const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
     let _icx = cx.insn_ctxt("trans_const_expr");
     alt e.node {
-      ast::expr_lit(lit) { ret trans_crate_lit(cx, e, *lit); }
+      ast::expr_lit(lit) { trans_crate_lit(cx, e, *lit) }
+      // If we have a vstore, just keep going; it has to be a string
+      ast::expr_vstore(e, _) { trans_const_expr(cx, e) }
       ast::expr_binary(b, e1, e2) {
         let te1 = trans_const_expr(cx, e1);
         let te2 = trans_const_expr(cx, e2);