incr.comp.: Remove saving and loading of legacy dep-graph.

Author: michaelwoerister

src/librustc/dep_graph/graph.rs

@@ -506,7 +506,9 @@ impl DepGraph {
                 None => {
                     if dep_dep_node.kind.is_input() {
                         // This input does not exist anymore.
-                        debug_assert!(dep_dep_node.extract_def_id(tcx).is_none());
+                        debug_assert!(dep_dep_node.extract_def_id(tcx).is_none(),
+                                      "Encountered input {:?} without color",
+                                      dep_dep_node);
                         debug!("try_mark_green({:?}) - END - dependency {:?} \
                                 was deleted input", dep_node, dep_dep_node);
                         return None;

src/librustc_driver/driver.rs

@@ -642,8 +642,8 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
     );
 
     let dep_graph = if sess.opts.build_dep_graph() {
-        let prev_dep_graph = time(time_passes, "load prev dep-graph (new)", || {
-            rustc_incremental::load_dep_graph_new(sess)
+        let prev_dep_graph = time(time_passes, "load prev dep-graph", || {
+            rustc_incremental::load_dep_graph(sess)
         });
 
         DepGraph::new(prev_dep_graph)
@@ -1052,9 +1052,9 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
                              tx,
                              output_filenames,
                              |tcx| {
-        time(time_passes,
-             "load_dep_graph",
-             || rustc_incremental::load_dep_graph(tcx));
+        // Do some initialization of the DepGraph that can only be done with the
+        // tcx available.
+        rustc_incremental::dep_graph_tcx_init(tcx);
 
         time(time_passes,
              "stability checking",

src/librustc_incremental/lib.rs

@@ -32,7 +32,7 @@ mod persist;
 
 pub use assert_dep_graph::assert_dep_graph;
 pub use persist::load_dep_graph;
-pub use persist::load_dep_graph_new;
+pub use persist::dep_graph_tcx_init;
 pub use persist::save_dep_graph;
 pub use persist::save_trans_partition;
 pub use persist::save_work_products;

src/librustc_incremental/persist/data.rs

@@ -10,78 +10,11 @@
 
 //! The data that we will serialize and deserialize.
 
-use rustc::dep_graph::{DepNode, WorkProduct, WorkProductId};
+use rustc::dep_graph::{WorkProduct, WorkProductId};
 use rustc::hir::def_id::DefIndex;
 use rustc::hir::map::DefPathHash;
-use rustc::ich::Fingerprint;
 use rustc::middle::cstore::EncodedMetadataHash;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::indexed_vec::{IndexVec, Idx};
-
-/// Data for use when recompiling the **current crate**.
-#[derive(Debug, RustcEncodable, RustcDecodable)]
-pub struct SerializedDepGraph {
-    /// The set of all DepNodes in the graph
-    pub nodes: IndexVec<DepNodeIndex, DepNode>,
-    /// For each DepNode, stores the list of edges originating from that
-    /// DepNode. Encoded as a [start, end) pair indexing into edge_list_data,
-    /// which holds the actual DepNodeIndices of the target nodes.
-    pub edge_list_indices: IndexVec<DepNodeIndex, (u32, u32)>,
-    /// A flattened list of all edge targets in the graph. Edge sources are
-    /// implicit in edge_list_indices.
-    pub edge_list_data: Vec<DepNodeIndex>,
-
-    /// These are output nodes that have no incoming edges. We track
-    /// these separately so that when we reload all edges, we don't
-    /// lose track of these nodes.
-    pub bootstrap_outputs: Vec<DepNode>,
-
-    /// These are hashes of two things:
-    /// - the HIR nodes in this crate
-    /// - the metadata nodes from dependent crates we use
-    ///
-    /// In each case, we store a hash summarizing the contents of
-    /// those items as they were at the time we did this compilation.
-    /// In the case of HIR nodes, this hash is derived by walking the
-    /// HIR itself. In the case of metadata nodes, the hash is loaded
-    /// from saved state.
-    ///
-    /// When we do the next compile, we will load these back up and
-    /// compare them against the hashes we see at that time, which
-    /// will tell us what has changed, either in this crate or in some
-    /// crate that we depend on.
-    ///
-    /// Because they will be reloaded, we don't store the DefId (which
-    /// will be different when we next compile) related to each node,
-    /// but rather the `DefPathIndex`. This can then be retraced
-    /// to find the current def-id.
-    pub hashes: Vec<(DepNodeIndex, Fingerprint)>,
-}
-
-impl SerializedDepGraph {
-    pub fn edge_targets_from(&self, source: DepNodeIndex) -> &[DepNodeIndex] {
-        let targets = self.edge_list_indices[source];
-        &self.edge_list_data[targets.0 as usize .. targets.1 as usize]
-    }
-}
-
-/// The index of a DepNode in the SerializedDepGraph::nodes array.
-#[derive(Copy, Clone, Hash, Eq, PartialEq, Ord, PartialOrd, Debug,
-         RustcEncodable, RustcDecodable)]
-pub struct DepNodeIndex(pub u32);
-
-impl Idx for DepNodeIndex {
-    #[inline]
-    fn new(idx: usize) -> Self {
-        assert!(idx <= ::std::u32::MAX as usize);
-        DepNodeIndex(idx as u32)
-    }
-
-    #[inline]
-    fn index(self) -> usize {
-        self.0 as usize
-    }
-}
 
 #[derive(Debug, RustcEncodable, RustcDecodable)]
 pub struct SerializedWorkProduct {

src/librustc_incremental/persist/fs.rs

@@ -129,7 +129,6 @@ use std::__rand::{thread_rng, Rng};
 
 const LOCK_FILE_EXT: &'static str = ".lock";
 const DEP_GRAPH_FILENAME: &'static str = "dep-graph.bin";
-const DEP_GRAPH_NEW_FILENAME: &'static str = "dep-graph-new.bin";
 const WORK_PRODUCTS_FILENAME: &'static str = "work-products.bin";
 const METADATA_HASHES_FILENAME: &'static str = "metadata.bin";
 
@@ -143,10 +142,6 @@ pub fn dep_graph_path(sess: &Session) -> PathBuf {
     in_incr_comp_dir_sess(sess, DEP_GRAPH_FILENAME)
 }
 
-pub fn dep_graph_path_new(sess: &Session) -> PathBuf {
-    in_incr_comp_dir_sess(sess, DEP_GRAPH_NEW_FILENAME)
-}
-
 pub fn work_products_path(sess: &Session) -> PathBuf {
     in_incr_comp_dir_sess(sess, WORK_PRODUCTS_FILENAME)
 }