---

yaml
---
r: 139773
b: refs/heads/try2
c: 04b2c26
h: refs/heads/master
i:
  139771: 1cd2f1b
v: v3

Author: jld

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2589eba957ee5632dc9060022b5ca09cbfb782f9
+refs/heads/try2: 04b2c26f39782ba30ad8868f971d5d8a606fcf88
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/reflect.rs

@@ -275,26 +275,27 @@ pub impl Reflector {
             let variants = ty::substd_enum_variants(ccx.tcx, did, substs);
             let llptrty = T_ptr(type_of(ccx, t));
 
-            // Build the get_disr function.  (XXX: break this out into a function)
-            let sub_path = bcx.fcx.path + ~[path_name(special_idents::anon)];
-            let get_disr_sym = mangle_internal_name_by_path_and_seq(ccx, sub_path, ~"get_disr");
-            let get_disr_args = [ty::arg { mode: ast::expl(ast::by_copy),
-                                           ty: ty::mk_nil_ptr(ccx.tcx) }];
-            let get_disr_llfty = type_of_fn(ccx, get_disr_args, ty::mk_int(ccx.tcx));
-            let get_disr_llfdecl = decl_internal_cdecl_fn(ccx.llmod, get_disr_sym, get_disr_llfty);
-            let get_disr_arg = unsafe {
-                llvm::LLVMGetParam(get_disr_llfdecl, first_real_arg as c_uint)
+            let make_get_disr = || {
+                let sub_path = bcx.fcx.path + ~[path_name(special_idents::anon)];
+                let sym = mangle_internal_name_by_path_and_seq(ccx, sub_path, ~"get_disr");
+                let args = [ty::arg { mode: ast::expl(ast::by_copy),
+                                      ty: ty::mk_nil_ptr(ccx.tcx) }];
+                let llfty = type_of_fn(ccx, args, ty::mk_int(ccx.tcx));
+                let llfdecl = decl_internal_cdecl_fn(ccx.llmod, sym, llfty);
+                let arg = unsafe {
+                    llvm::LLVMGetParam(llfdecl, first_real_arg as c_uint)
+                };
+                let fcx = new_fn_ctxt(ccx, ~[], llfdecl, None);
+                let bcx = top_scope_block(fcx, None);
+                let arg = BitCast(bcx, arg, llptrty);
+                let ret = adt::trans_get_discr(bcx, repr, arg);
+                Store(bcx, ret, fcx.llretptr);
+                cleanup_and_Br(bcx, bcx, fcx.llreturn);
+                finish_fn(fcx, bcx.llbb);
+                llfdecl
             };
-            let get_disr_fcx = new_fn_ctxt(ccx, ~[], get_disr_llfdecl, None);
-            let get_disr_bcx = top_scope_block(get_disr_fcx, None);
-            let get_disr_arg = BitCast(get_disr_bcx, get_disr_arg, llptrty);
-            let get_disr_ret = adt::trans_get_discr(get_disr_bcx, repr, get_disr_arg);
-            Store(get_disr_bcx, get_disr_ret, get_disr_fcx.llretptr);
-            cleanup_and_Br(get_disr_bcx, get_disr_bcx, get_disr_fcx.llreturn);
-            finish_fn(get_disr_fcx, get_disr_bcx.llbb);
 
-            let enum_args = ~[self.c_uint(vec::len(variants)),
-                              get_disr_llfdecl]
+            let enum_args = ~[self.c_uint(vec::len(variants)), make_get_disr()]
                 + self.c_size_and_align(t);
             do self.bracketed(~"enum", enum_args) |this| {
                 for variants.eachi |i, v| {