---

yaml
---
r: 30335
b: refs/heads/incoming
c: 9db4445
h: refs/heads/master
i:
  30333: c106fd6
  30331: e439147
  30327: 37d4aab
  30319: 45a65de
  30303: 9f51948
  30271: 08aeb86
  30207: a02edb7
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: fa2fb0f86831c7bdb1c874eb49074d11640d5cf9
+refs/heads/incoming: 9db44454541a9bcf1b1bed6cdda3c3213f355a25
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/alt.rs

@@ -58,8 +58,7 @@ fn trans_opt(bcx: block, o: opt) -> opt_result {
             return single_result(rslt(bcx, *cell));
           }
           _ => {
-            return single_result(
-                rslt(bcx, consts::const_expr(ccx, l)));
+            return single_result(trans_temp_expr(bcx, l));
           }
         }
       }
@@ -636,13 +635,14 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
             }
           }
           lit(_) => {
-            test_val = Load(bcx, val);
             let pty = node_id_type(bcx, pat_id);
+            test_val = load_if_immediate(bcx, val, pty);
             kind = if ty::type_is_integral(pty) { switch }
                    else { compare };
           }
           range(_, _) => {
-            test_val = Load(bcx, val);
+            let pty = node_id_type(bcx, pat_id);
+            test_val = load_if_immediate(bcx, val, pty);
             kind = compare;
           }
         }

branches/incoming/src/test/run-pass/alt-borrowed_str.rs

@@ -0,0 +1,51 @@
+// -*- rust -*-
+fn f1(ref_string: &str) {
+    match ref_string {
+        "a" => io::println("found a"),
+        "b" => io::println("found b"),
+        _ => io::println("not found")
+    }
+}
+
+fn f2(ref_string: &str) {
+    match ref_string {
+        "a" => io::println("found a"),
+        "b" => io::println("found b"),
+        s => io::println(fmt!("not found (%s)", s))
+    }
+}
+
+fn g1(ref_1: &str, ref_2: &str) {
+    match (ref_1, ref_2) {
+        ("a", "b") => io::println("found a,b"),
+        ("b", "c") => io::println("found b,c"),
+        _ => io::println("not found")
+    }
+}
+
+fn g2(ref_1: &str, ref_2: &str) {
+    match (ref_1, ref_2) {
+        ("a", "b") => io::println("found a,b"),
+        ("b", "c") => io::println("found b,c"),
+        (s1, s2) => io::println(fmt!("not found (%s, %s)", s1, s2))
+    }
+}
+
+fn main() {
+    f1(@"a");
+    f1(~"b");
+    f1(&"c");
+    f1("d");
+    f2(@"a");
+    f2(~"b");
+    f2(&"c");
+    f2("d");
+    g1(@"a", @"b");
+    g1(~"b", ~"c");
+    g1(&"c", &"d");
+    g1("d", "e");
+    g2(@"a", @"b");
+    g2(~"b", ~"c");
+    g2(&"c", &"d");
+    g2("d", "e");
+}