---

yaml
---
r: 41700
b: refs/heads/master
c: 4526424
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f38e9724e6fbc99668b523f30c7e6ca25c20645b
+refs/heads/master: 452642422dda045b89cbcb2b7d011c85c5202d5d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

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

@@ -779,6 +779,30 @@ fn trans_external_path(ccx: @crate_ctxt, did: ast::def_id, t: ty::t)
     };
 }
 
+fn get_discrim_val(cx: @crate_ctxt, span: span, enum_did: ast::def_id,
+                   variant_did: ast::def_id) -> ValueRef {
+    // Can't use `discrims` from the crate context here because
+    // those discriminants have an extra level of indirection,
+    // and there's no LLVM constant load instruction.
+    let mut lldiscrim_opt = None;
+    for ty::enum_variants(cx.tcx, enum_did).each |variant_info| {
+        if variant_info.id == variant_did {
+            lldiscrim_opt = Some(C_int(cx,
+                                       variant_info.disr_val));
+            break;
+        }
+    }
+
+    match lldiscrim_opt {
+        None => {
+            cx.tcx.sess.span_bug(span, ~"didn't find discriminant?!");
+        }
+        Some(found_lldiscrim) => {
+            found_lldiscrim
+        }
+    }
+}
+
 fn lookup_discriminant(ccx: @crate_ctxt, vid: ast::def_id) -> ValueRef {
     unsafe {
         let _icx = ccx.insn_ctxt("lookup_discriminant");

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

@@ -416,31 +416,10 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                     // variants.
                     let ety = ty::expr_ty(cx.tcx, e);
                     let llty = type_of::type_of(cx, ety);
+                    let lldiscrim = base::get_discrim_val(cx, e.span,
+                                                          enum_did,
+                                                          variant_did);
 
-                    // Can't use `discrims` from the crate context here
-                    // because those discriminants have an extra level of
-                    // indirection, and there's no LLVM constant load
-                    // instruction.
-                    let mut lldiscrim_opt = None;
-                    for ty::enum_variants(cx.tcx, enum_did).each
-                            |variant_info| {
-                        if variant_info.id == variant_did {
-                            lldiscrim_opt = Some(C_int(cx,
-                                variant_info.disr_val));
-                            break;
-                        }
-                    }
-
-                    let lldiscrim;
-                    match lldiscrim_opt {
-                        None => {
-                            cx.tcx.sess.span_bug(e.span,
-                                ~"didn't find discriminant?!");
-                        }
-                        Some(found_lldiscrim) => {
-                            lldiscrim = found_lldiscrim;
-                        }
-                    }
                     let fields = if ty::enum_is_univariant(cx.tcx, enum_did) {
                         ~[lldiscrim]
                     } else {