---

yaml
---
r: 147608
b: refs/heads/try2
c: 13e1bf1
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a74138ed2253b792760f1fa6ab88d6b3d28a07e9
+refs/heads/try2: 13e1bf1881f2523edd315a73412f74339a2168db
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/debuginfo.rs

@@ -251,7 +251,7 @@ struct FunctionDebugContextData {
     scope_map: RefCell<HashMap<ast::NodeId, DIScope>>,
     fn_metadata: DISubprogram,
     argument_counter: Cell<uint>,
-    source_locations_enabled: bool,
+    source_locations_enabled: Cell<bool>,
 }
 
 enum VariableAccess<'a> {
@@ -569,7 +569,7 @@ pub fn set_source_location(fcx: &FunctionContext,
 
     debug!("set_source_location: {}", cx.sess.codemap.span_to_str(span));
 
-    if fcx.debug_context.get_ref(cx, span).source_locations_enabled {
+    if fcx.debug_context.get_ref(cx, span).source_locations_enabled.get() {
         let loc = span_start(cx, span);
         let scope = scope_metadata(fcx, node_id, span);
 
@@ -598,7 +598,9 @@ pub fn clear_source_location(fcx: &FunctionContext) {
 /// translated.
 pub fn start_emitting_source_locations(fcx: &mut FunctionContext) {
     match fcx.debug_context {
-        FunctionDebugContext(~ref mut data) => data.source_locations_enabled = true,
+        FunctionDebugContext(~ref mut data) => {
+            data.source_locations_enabled.set(true)
+        },
         _ => { /* safe to ignore */ }
     }
 }
@@ -765,7 +767,7 @@ pub fn create_function_debug_context(cx: &CrateContext,
         scope_map: RefCell::new(HashMap::new()),
         fn_metadata: fn_metadata,
         argument_counter: Cell::new(1),
-        source_locations_enabled: false,
+        source_locations_enabled: Cell::new(false),
     };
 
     let arg_pats = fn_decl.inputs.map(|arg_ref| arg_ref.pat);
@@ -1049,7 +1051,11 @@ fn declare_local(bcx: @Block,
 
     match variable_kind {
         ArgumentVariable(_) | CapturedVariable => {
-            assert!(!bcx.fcx.debug_context.get_ref(cx, span).source_locations_enabled);
+            assert!(!bcx.fcx
+                        .debug_context
+                        .get_ref(cx, span)
+                        .source_locations_enabled
+                        .get());
             set_debug_location(cx, UnknownLocation);
         }
         _ => { /* nothing to do */ }