---

yaml
---
r: 96991
b: refs/heads/dist-snap
c: e66bcf4
h: refs/heads/master
i:
  96989: 993c96f
  96987: 46239e1
  96983: 92512d1
  96975: f39da74
  96959: 0d6ff60
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: f38561dfd603c5a39dc1c31b0165589da6a2f5b3
+refs/heads/dist-snap: e66bcf44b969eb0c211dd16de89993dcdd160aa4
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -142,7 +142,7 @@ use middle::pat_util;
 use util::ppaux;
 
 use std::c_str::ToCStr;
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::hashmap::HashMap;
 use std::hashmap::HashSet;
 use std::libc::{c_uint, c_ulonglong, c_longlong};
@@ -175,7 +175,7 @@ pub struct CrateDebugContext {
     priv crate_file: ~str,
     priv llcontext: ContextRef,
     priv builder: DIBuilderRef,
-    priv current_debug_location: DebugLocation,
+    priv current_debug_location: Cell<DebugLocation>,
     priv created_files: RefCell<HashMap<~str, DIFile>>,
     priv created_types: RefCell<HashMap<uint, DIType>>,
     priv namespace_map: RefCell<HashMap<~[ast::Ident], @NamespaceTreeNode>>,
@@ -194,7 +194,7 @@ impl CrateDebugContext {
             crate_file: crate,
             llcontext: llcontext,
             builder: builder,
-            current_debug_location: UnknownLocation,
+            current_debug_location: Cell::new(UnknownLocation),
             created_files: RefCell::new(HashMap::new()),
             created_types: RefCell::new(HashMap::new()),
             namespace_map: RefCell::new(HashMap::new()),
@@ -2193,7 +2193,7 @@ impl DebugLocation {
 }
 
 fn set_debug_location(cx: &mut CrateContext, debug_location: DebugLocation) {
-    if debug_location == debug_context(cx).current_debug_location {
+    if debug_location == debug_context(cx).current_debug_location.get() {
         return;
     }
 
@@ -2220,7 +2220,7 @@ fn set_debug_location(cx: &mut CrateContext, debug_location: DebugLocation) {
         llvm::LLVMSetCurrentDebugLocation(cx.builder.B, metadata_node);
     }
 
-    debug_context(cx).current_debug_location = debug_location;
+    debug_context(cx).current_debug_location.set(debug_location);
 }
 
 //=-------------------------------------------------------------------------------------------------