---

yaml
---
r: 271535
b: refs/heads/auto
c: cd5cf09
h: refs/heads/master
i:
  271533: 344eb8b
  271531: 5468c2e
  271527: 793f338
  271519: 8ecce88

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ab9b8441468aed505f83a2ddf74454f9cdfeab33
+refs/heads/auto: cd5cf09635c41e3f9b6df79a50c1fb24ee855153
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc/front/map/mod.rs

@@ -19,7 +19,7 @@ use dep_graph::{DepGraph, DepNode};
 
 use middle::cstore::InlinedItem;
 use middle::cstore::InlinedItem as II;
-use middle::def_id::DefId;
+use middle::def_id::{CRATE_DEF_INDEX, DefId};
 
 use syntax::abi::Abi;
 use syntax::ast::{self, Name, NodeId, DUMMY_NODE_ID};
@@ -388,6 +388,15 @@ impl<'ast> Map<'ast> {
         self.forest.krate()
     }
 
+    /// Get the attributes on the krate. This is preferable to
+    /// invoking `krate.attrs` because it registers a tighter
+    /// dep-graph access.
+    pub fn krate_attrs(&self) -> &'ast [ast::Attribute] {
+        let crate_root_def_id = DefId::local(CRATE_DEF_INDEX);
+        self.dep_graph.read(DepNode::Hir(crate_root_def_id));
+        &self.forest.krate.attrs
+    }
+
     /// Retrieve the Node corresponding to `id`, panicking if it cannot
     /// be found.
     pub fn get(&self, id: NodeId) -> Node<'ast> {

branches/auto/src/librustc_trans/trans/debuginfo/gdb.rs

@@ -90,10 +90,7 @@ pub fn get_or_insert_gdb_debug_scripts_section_global(ccx: &CrateContext)
 
 pub fn needs_gdb_debug_scripts_section(ccx: &CrateContext) -> bool {
     let omit_gdb_pretty_printer_section =
-        attr::contains_name(&ccx.tcx()
-                                .map
-                                .krate()
-                                .attrs,
+        attr::contains_name(&ccx.tcx().map.krate_attrs(),
                             "omit_gdb_pretty_printer_section");
 
     !omit_gdb_pretty_printer_section &&