---

yaml
---
r: 90742
b: refs/heads/master
c: 3ed45bb
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 38be67a1b996f577f0334dc1f71c176adef54ff9
+refs/heads/master: 3ed45bb595571495e4d9165ace5c604523d13b97
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

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

@@ -178,7 +178,7 @@ pub struct CrateDebugContext {
     priv current_debug_location: DebugLocation,
     priv created_files: RefCell<HashMap<~str, DIFile>>,
     priv created_types: RefCell<HashMap<uint, DIType>>,
-    priv namespace_map: HashMap<~[ast::Ident], @NamespaceTreeNode>,
+    priv namespace_map: RefCell<HashMap<~[ast::Ident], @NamespaceTreeNode>>,
     // This collection is used to assert that composite types (structs, enums, ...) have their
     // members only set once:
     priv composite_types_completed: HashSet<DIType>,
@@ -197,7 +197,7 @@ impl CrateDebugContext {
             current_debug_location: UnknownLocation,
             created_files: RefCell::new(HashMap::new()),
             created_types: RefCell::new(HashMap::new()),
-            namespace_map: HashMap::new(),
+            namespace_map: RefCell::new(HashMap::new()),
             composite_types_completed: HashSet::new(),
         };
     }
@@ -2819,7 +2819,10 @@ fn namespace_for_item(cx: &mut CrateContext,
         let ident = path_element.ident();
         current_key.push(ident);
 
-        let existing_node = debug_context(cx).namespace_map.find_copy(&current_key);
+        let existing_node = {
+            let namespace_map = debug_context(cx).namespace_map.borrow();
+            namespace_map.get().find_copy(&current_key)
+        };
         let current_node = match existing_node {
             Some(existing_node) => existing_node,
             None => {
@@ -2847,7 +2850,11 @@ fn namespace_for_item(cx: &mut CrateContext,
                     parent: parent_node,
                 };
 
-                debug_context(cx).namespace_map.insert(current_key.clone(), node);
+                {
+                    let mut namespace_map = debug_context(cx).namespace_map
+                                                             .borrow_mut();
+                    namespace_map.get().insert(current_key.clone(), node);
+                }
 
                 node
             }