---

yaml
---
r: 66127
b: refs/heads/master
c: 66d8e8b
h: refs/heads/master
i:
  66125: c64caaa
  66123: 64a1c0c
  66119: 2c29ea4
  66111: f0fe15d
v: v3

Author: James Miller

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b4b2cbb299842a6854a7e82e745b8a9b63c8d6b9
+refs/heads/master: 66d8e8b481a487d372936c553bf7a6d7435056c7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

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

@@ -138,13 +138,6 @@ fn fcx_has_nonzero_span(fcx: fn_ctxt) -> bool {
     }
 }
 
-pub fn log_fn_time(ccx: @mut CrateContext, name: ~str, start: time::Timespec,
-                   end: time::Timespec) {
-    let elapsed = 1000 * ((end.sec - start.sec) as int) +
-        ((end.nsec as int) - (start.nsec as int)) / 1000000;
-    ccx.stats.fn_times.push((name, elapsed));
-}
-
 pub fn decl_fn(llmod: ModuleRef,
                name: &str,
                cc: lib::llvm::CallConv,
@@ -1962,7 +1955,7 @@ pub fn trans_fn(ccx: @mut CrateContext,
                   |_bcx| { });
     if do_time {
         let end = time::get_time();
-        log_fn_time(ccx, the_path_str, start, end);
+        ccx.log_fn_time(the_path_str, start, end);
     }
 }
 
@@ -3130,11 +3123,6 @@ pub fn trans_crate(sess: session::Session,
         io::println(fmt!("n_closures: %u", ccx.stats.n_closures));
     }
 
-    if ccx.sess.count_llvm_insns() {
-        for ccx.stats.llvm_insns.each |&k, &v| {
-            io::println(fmt!("%-7u %s", v, k));
-        }
-    }
     let llcx = ccx.llcx;
     let link_meta = ccx.link_meta;
     let llmod = ccx.llmod;

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

@@ -31,6 +31,7 @@ use core::hash;
 use core::hashmap::{HashMap, HashSet};
 use core::str;
 use core::local_data;
+use extra::time;
 use syntax::ast;
 
 use middle::trans::common::{ExternMap,tydesc_info,BuilderRef_res,Stats,namegen,addrspace_gen};
@@ -222,6 +223,12 @@ impl CrateContext {
             }
         }
     }
+
+    pub fn log_fn_time(&mut self, name: ~str, start: time::Timespec, end: time::Timespec) {
+        let elapsed = 1000 * ((end.sec - start.sec) as int) +
+            ((end.nsec as int) - (start.nsec as int)) / 1000000;
+        self.stats.fn_times.push((name, elapsed));
+    }
 }
 
 #[unsafe_destructor]

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

@@ -731,10 +731,7 @@ pub fn make_generic_glue(ccx: @mut CrateContext,
     let start = time::get_time();
     let llval = make_generic_glue_inner(ccx, t, llfn, helper);
     let end = time::get_time();
-    log_fn_time(ccx,
-                fmt!("glue %s %s", name, ty_to_short_str(ccx.tcx, t)),
-                start,
-                end);
+    ccx.log_fn_time(fmt!("glue %s %s", name, ty_to_short_str(ccx.tcx, t)), start, end);
     return llval;
 }