---

yaml
---
r: 97143
b: refs/heads/dist-snap
c: 75efa07
h: refs/heads/master
i:
  97141: 89a5041
  97139: 721e79a
  97135: 76268f7
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 26d139476722d3c218736f23d5423cc3e4b2453e
+refs/heads/dist-snap: 75efa0725d720369c3ecb552dcc63a7bad07123a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -3247,7 +3247,7 @@ pub fn trans_crate(sess: session::Session,
         println("--- trans stats ---");
         println!("n_static_tydescs: {}", ccx.stats.n_static_tydescs.get());
         println!("n_glues_created: {}", ccx.stats.n_glues_created.get());
-        println!("n_null_glues: {}", ccx.stats.n_null_glues);
+        println!("n_null_glues: {}", ccx.stats.n_null_glues.get());
         println!("n_real_glues: {}", ccx.stats.n_real_glues);
 
         println!("n_fns: {}", ccx.stats.n_fns);

branches/dist-snap/src/librustc/middle/trans/common.rs

@@ -128,7 +128,7 @@ pub struct tydesc_info {
 pub struct Stats {
     n_static_tydescs: Cell<uint>,
     n_glues_created: Cell<uint>,
-    n_null_glues: uint,
+    n_null_glues: Cell<uint>,
     n_real_glues: uint,
     n_fns: uint,
     n_monos: uint,

branches/dist-snap/src/librustc/middle/trans/context.rs

@@ -213,7 +213,7 @@ impl CrateContext {
                   stats: @mut Stats {
                     n_static_tydescs: Cell::new(0u),
                     n_glues_created: Cell::new(0u),
-                    n_null_glues: 0u,
+                    n_null_glues: Cell::new(0u),
                     n_real_glues: 0u,
                     n_fns: 0u,
                     n_monos: 0u,

branches/dist-snap/src/librustc/middle/trans/glue.rs

@@ -708,7 +708,11 @@ pub fn emit_tydescs(ccx: &CrateContext) {
         // calling it.
         let take_glue =
             match ti.take_glue.get() {
-              None => { ccx.stats.n_null_glues += 1u; C_null(glue_fn_ty) }
+              None => {
+                  ccx.stats.n_null_glues.set(ccx.stats.n_null_glues.get() +
+                                             1);
+                  C_null(glue_fn_ty)
+              }
               Some(v) => {
                 unsafe {
                     ccx.stats.n_real_glues += 1u;
@@ -718,7 +722,11 @@ pub fn emit_tydescs(ccx: &CrateContext) {
             };
         let drop_glue =
             match ti.drop_glue.get() {
-              None => { ccx.stats.n_null_glues += 1u; C_null(glue_fn_ty) }
+              None => {
+                  ccx.stats.n_null_glues.set(ccx.stats.n_null_glues.get() +
+                                             1u);
+                  C_null(glue_fn_ty)
+              }
               Some(v) => {
                 unsafe {
                     ccx.stats.n_real_glues += 1u;
@@ -728,7 +736,11 @@ pub fn emit_tydescs(ccx: &CrateContext) {
             };
         let free_glue =
             match ti.free_glue.get() {
-              None => { ccx.stats.n_null_glues += 1u; C_null(glue_fn_ty) }
+              None => {
+                  ccx.stats.n_null_glues.set(ccx.stats.n_null_glues.get() +
+                                             1u);
+                  C_null(glue_fn_ty)
+              }
               Some(v) => {
                 unsafe {
                     ccx.stats.n_real_glues += 1u;
@@ -738,7 +750,11 @@ pub fn emit_tydescs(ccx: &CrateContext) {
             };
         let visit_glue =
             match ti.visit_glue.get() {
-              None => { ccx.stats.n_null_glues += 1u; C_null(glue_fn_ty) }
+              None => {
+                  ccx.stats.n_null_glues.set(ccx.stats.n_null_glues.get() +
+                                             1u);
+                  C_null(glue_fn_ty)
+              }
               Some(v) => {
                 unsafe {
                     ccx.stats.n_real_glues += 1u;