---

yaml
---
r: 30731
b: refs/heads/incoming
c: ac822a5
h: refs/heads/master
i:
  30729: 21b5d56
  30727: dc03639
v: v3

Author: pcwalton

[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: dbc00ced3a09a7a8c32d69a89b9e073252cca39d
+refs/heads/incoming: ac822a52be47579ffa59d5ca3e125680a79545d0
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/logging.rs

@@ -4,13 +4,16 @@
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-export console_on, console_off;
+use cast::transmute;
+
+export console_on, console_off, log_type;
 
 #[nolink]
 extern mod rustrt {
     #[legacy_exports];
     fn rust_log_console_on();
     fn rust_log_console_off();
+    fn rust_log_str(level: u32, string: *libc::c_char, size: libc::size_t);
 }
 
 /// Turns on logging to stdout globally
@@ -27,4 +30,17 @@ fn console_on() {
  */
 fn console_off() {
     rustrt::rust_log_console_off();
-}
+}
+
+#[cfg(notest)]
+#[lang="log_type"]
+pub fn log_type<T>(level: u32, object: &T) {
+    let bytes = do io::with_bytes_writer() |writer| {
+        repr::write_repr(writer, object);
+    };
+    unsafe {
+        let len = bytes.len() as libc::size_t;
+        rustrt::rust_log_str(level, transmute(vec::raw::to_ptr(bytes)), len);
+    }
+}
+

branches/incoming/src/rt/rust_builtin.cpp

@@ -952,9 +952,9 @@ rust_call_tydesc_glue(void *root, size_t *tydesc, size_t glue_index) {
 
 // Don't run on the Rust stack!
 extern "C" void
-rust_log_str(uint32_t level, const char *str) {
+rust_log_str(uint32_t level, const char *str, size_t size) {
     rust_task *task = rust_get_current_task();
-    task->sched_loop->get_log().log(task, level, "%s", str);
+    task->sched_loop->get_log().log(task, level, "%.*s", (int)size, str);
 }
 
 //

branches/incoming/src/rustc/middle/lang_items.rs

@@ -46,7 +46,8 @@ struct LanguageItems {
 
     mut str_eq_fn: Option<def_id>,
     mut uniq_str_eq_fn: Option<def_id>,
-    mut annihilate_fn: Option<def_id>
+    mut annihilate_fn: Option<def_id>,
+    mut log_type_fn: Option<def_id>
 }
 
 mod LanguageItems {
@@ -76,7 +77,8 @@ mod LanguageItems {
 
             str_eq_fn: None,
             uniq_str_eq_fn: None,
-            annihilate_fn: None
+            annihilate_fn: None,
+            log_type_fn: None
         }
     }
 }
@@ -111,6 +113,7 @@ fn LanguageItemCollector(crate: @crate, session: session,
     item_refs.insert(~"str_eq", &mut items.str_eq_fn);
     item_refs.insert(~"uniq_str_eq", &mut items.uniq_str_eq_fn);
     item_refs.insert(~"annihilate", &mut items.annihilate_fn);
+    item_refs.insert(~"log_type", &mut items.log_type_fn);
 
     LanguageItemCollector {
         crate: crate,

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

@@ -2005,12 +2005,6 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
         }
         Call(bcx, main_llfn, args);
 
-        // Call the box annihilator.
-        // XXX: Crashes.
-        //let did = bcx.tcx().lang_items.annihilate_fn.get();
-        //let bcx = callee::trans_rtcall_or_lang_call(bcx, did, ~[],
-        //                                            expr::Ignore);
-
         build_return(bcx);
         finish_fn(fcx, lltop);
         return llfdecl;

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

@@ -290,6 +290,26 @@ fn trans_rtcall_or_lang_call(bcx: block, did: ast::def_id, args: ~[ValueRef],
         ArgVals(args), dest, DontAutorefArg);
 }
 
+fn trans_rtcall_or_lang_call_with_type_params(bcx: block,
+                                              did: ast::def_id,
+                                              args: ~[ValueRef],
+                                              type_params: ~[ty::t],
+                                              dest: expr::Dest) -> block {
+    let fty;
+    if did.crate == ast::local_crate {
+        fty = ty::node_id_to_type(bcx.tcx(), did.node);
+    } else {
+        fty = csearch::get_type(bcx.tcx(), did).ty;
+    }
+
+    let rty = ty::ty_fn_ret(fty);
+    return callee::trans_call_inner(
+        bcx, None, fty, rty,
+        |bcx| trans_fn_ref_with_vtables_to_callee(bcx, did, 0, type_params,
+                                                  None),
+        ArgVals(args), dest, DontAutorefArg);
+}
+
 fn body_contains_ret(body: ast::blk) -> bool {
     let cx = {mut found: false};
     visit::visit_block(body, cx, visit::mk_vt(@{

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

@@ -190,12 +190,12 @@ fn trans_log(log_ex: @ast::expr,
 
             // Translate the value to be logged
             let val_datum = unpack_datum!(bcx, expr::trans_to_datum(bcx, e));
-            let tydesc = get_tydesc_simple(ccx, val_datum.ty);
 
             // Call the polymorphic log function
             let val = val_datum.to_ref_llval(bcx);
-            let val = PointerCast(bcx, val, T_ptr(T_i8()));
-            Call(bcx, ccx.upcalls.log_type, [tydesc, val, level]);
+            let did = bcx.tcx().lang_items.log_type_fn.get();
+            let bcx = callee::trans_rtcall_or_lang_call_with_type_params(
+                bcx, did, ~[level, val], ~[val_datum.ty], expr::Ignore);
             bcx
         }
     }