---

yaml
---
r: 31724
b: refs/heads/dist-snap
c: 8c95fed
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 438765da59075339c99499e201384e835187f0ae
+refs/heads/dist-snap: 8c95feda3961efaffe4461d775b029f92a1744c4
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/driver/session.rs

@@ -41,6 +41,7 @@ const borrowck_note_pure: uint = 2048;
 const borrowck_note_loan: uint = 4096;
 const no_landing_pads: uint = 8192;
 const debug_llvm: uint = 16384;
+const count_type_sizes: uint = 32768;
 
 fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
     ~[(~"ppregions", ~"prettyprint regions with \
@@ -63,7 +64,9 @@ fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
       borrowck_note_loan),
      (~"no-landing-pads", ~"omit landing pads for unwinding",
       no_landing_pads),
-     (~"debug-llvm", ~"enable debug output from LLVM", debug_llvm)
+     (~"debug-llvm", ~"enable debug output from LLVM", debug_llvm),
+     (~"count-type-sizes", ~"count the sizes of aggregate types",
+      count_type_sizes)
     ]
 }
 
@@ -179,6 +182,7 @@ impl session for session {
     fn ppregions() -> bool { self.debugging_opt(ppregions) }
     fn time_passes() -> bool { self.debugging_opt(time_passes) }
     fn count_llvm_insns() -> bool { self.debugging_opt(count_llvm_insns) }
+    fn count_type_sizes() -> bool { self.debugging_opt(count_type_sizes) }
     fn time_llvm_passes() -> bool { self.debugging_opt(time_llvm_passes) }
     fn trans_stats() -> bool { self.debugging_opt(trans_stats) }
     fn no_asm_comments() -> bool { self.debugging_opt(no_asm_comments) }

branches/dist-snap/src/rustc/middle/trans/base.rs

@@ -490,6 +490,13 @@ fn note_unique_llvm_symbol(ccx: @crate_ctxt, sym: ~str) {
 fn declare_tydesc(ccx: @crate_ctxt, t: ty::t) -> @tydesc_info {
     let _icx = ccx.insn_ctxt(~"declare_tydesc");
     let llty = type_of(ccx, t);
+
+    if ccx.sess.count_type_sizes() {
+        io::println(fmt!("%u\t%s",
+                         llsize_of_real(ccx, llty),
+                         ty_to_str(ccx.tcx, t)));
+    }
+
     let llsize = llsize_of(ccx, llty);
     let llalign = llalign_of(ccx, llty);
     //XXX this triggers duplicate LLVM symbols
@@ -576,6 +583,7 @@ fn emit_tydescs(ccx: @crate_ctxt) {
     for ccx.tydescs.each |key, val| {
         let glue_fn_ty = T_ptr(T_glue_fn(ccx));
         let ti = val;
+
         let take_glue =
             match copy ti.take_glue {
               none => { ccx.stats.n_null_glues += 1u; C_null(glue_fn_ty) }