auto merge of #12096 : brson/rust/morestack-addr, r=thestinger

diff --cc src/librustc/middle/trans/intrinsic.rs
index 234b8072decc3eeeeaca2cd5287ef42504c0258a,8896a3de733377857f033f91cd0489261c9940d0..25ecbeaa9a5ed0d5af34a24af16e7b11aac7594e
--- 1/src/librustc/middle/trans/intrinsic.rs
--- 2/src/librustc/middle/trans/intrinsic.rs
+++ b/src/librustc/middle/trans/intrinsic.rs
@@@ -458,20 -459,10 +458,9 @@@ pub fn trans_intrinsic(ccx: @CrateConte
              let td = get_param(decl, first_real_arg);
              let visitor = get_param(decl, first_real_arg + 1u);
              let td = PointerCast(bcx, td, ccx.tydesc_type.ptr_to());
 -            glue::call_tydesc_glue_full(bcx, visitor, td,
 -                                        abi::tydesc_field_visit_glue, None);
 +            glue::call_visit_glue(bcx, visitor, td, None);
              RetVoid(bcx);
          }
-         "morestack_addr" => {
-             // FIXME This is a hack to grab the address of this particular
-             // native function. There should be a general in-language
-             // way to do this
-             let llfty = type_of_rust_fn(bcx.ccx(), false, [], ty::mk_nil());
-             let morestack_addr = decl_cdecl_fn(bcx.ccx().llmod, "__morestack",
-                                                llfty, ty::mk_nil());
-             let morestack_addr = PointerCast(bcx, morestack_addr,
-                                              Type::nil().ptr_to());
-             Ret(bcx, morestack_addr);
-         }
          "offset" => {
              let ptr = get_param(decl, first_real_arg);
              let offset = get_param(decl, first_real_arg + 1);

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge