Auto merge of #46560 - Yoric:incr, r=michaelwoerister

Loading the dependency graph in the background

Patch is a bit longer than I expected, due to the fact that most of this code relies upon a `Session` value, which is not `Sync`.

Author: bors

src/librustc_data_structures/indexed_vec.rs

@@ -330,6 +330,10 @@ pub struct IndexVec<I: Idx, T> {
     _marker: PhantomData<Fn(&I)>
 }
 
+// Whether `IndexVec` is `Send` depends only on the data,
+// not the phantom data.
+unsafe impl<I: Idx, T> Send for IndexVec<I, T> where T: Send {}
+
 impl<I: Idx, T: serialize::Encodable> serialize::Encodable for IndexVec<I, T> {
     fn encode<S: serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
         serialize::Encodable::encode(&self.raw, s)

src/librustc_driver/driver.rs

@@ -646,14 +646,11 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
         disambiguator,
     );
 
-    let dep_graph = if sess.opts.build_dep_graph() {
-        let prev_dep_graph = time(time_passes, "load prev dep-graph", || {
-            rustc_incremental::load_dep_graph(sess)
-        });
-
-        DepGraph::new(prev_dep_graph)
+    // If necessary, compute the dependency graph (in the background).
+    let future_dep_graph = if sess.opts.build_dep_graph() {
+        Some(rustc_incremental::load_dep_graph(sess, time_passes))
     } else {
-        DepGraph::new_disabled()
+        None
     };
 
     time(time_passes, "recursion limit", || {
@@ -881,6 +878,17 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
     })?;
 
     // Lower ast -> hir.
+    // First, we need to collect the dep_graph.
+    let dep_graph = match future_dep_graph {
+        None => DepGraph::new_disabled(),
+        Some(future) => {
+            let prev_graph = future
+                .open()
+                .expect("Could not join with background dep_graph thread")
+                .open(sess);
+            DepGraph::new(prev_graph)
+        }
+    };
     let hir_forest = time(time_passes, "lowering ast -> hir", || {
         let hir_crate = lower_crate(sess, cstore, &dep_graph, &krate, &mut resolver);
 

src/librustc_incremental/persist/file_format.rs

@@ -24,7 +24,6 @@ use std::path::Path;
 use std::fs::File;
 use std::env;
 
-use rustc::session::Session;
 use rustc::session::config::nightly_options;
 
 /// The first few bytes of files generated by incremental compilation
@@ -60,7 +59,9 @@ pub fn write_file_header<W: io::Write>(stream: &mut W) -> io::Result<()> {
 ///   incompatible version of the compiler.
 /// - Returns `Err(..)` if some kind of IO error occurred while reading the
 ///   file.
-pub fn read_file(sess: &Session, path: &Path) -> io::Result<Option<(Vec<u8>, usize)>> {
+pub fn read_file(report_incremental_info: bool, path: &Path)
+    -> io::Result<Option<(Vec<u8>, usize)>>
+{
     if !path.exists() {
         return Ok(None);
     }
@@ -79,7 +80,7 @@ pub fn read_file(sess: &Session, path: &Path) -> io::Result<Option<(Vec<u8>, usi
         let mut file_magic = [0u8; 4];
         file.read_exact(&mut file_magic)?;
         if file_magic != FILE_MAGIC {
-            report_format_mismatch(sess, path, "Wrong FILE_MAGIC");
+            report_format_mismatch(report_incremental_info, path, "Wrong FILE_MAGIC");
             return Ok(None)
         }
     }
@@ -93,7 +94,7 @@ pub fn read_file(sess: &Session, path: &Path) -> io::Result<Option<(Vec<u8>, usi
                                     ((header_format_version[1] as u16) << 8);
 
         if header_format_version != HEADER_FORMAT_VERSION {
-            report_format_mismatch(sess, path, "Wrong HEADER_FORMAT_VERSION");
+            report_format_mismatch(report_incremental_info, path, "Wrong HEADER_FORMAT_VERSION");
             return Ok(None)
         }
     }
@@ -108,7 +109,7 @@ pub fn read_file(sess: &Session, path: &Path) -> io::Result<Option<(Vec<u8>, usi
         file.read_exact(&mut buffer)?;
 
         if buffer != rustc_version().as_bytes() {
-            report_format_mismatch(sess, path, "Different compiler version");
+            report_format_mismatch(report_incremental_info, path, "Different compiler version");
             return Ok(None);
         }
     }
@@ -117,10 +118,10 @@ pub fn read_file(sess: &Session, path: &Path) -> io::Result<Option<(Vec<u8>, usi
     Ok(Some((file.into_inner(), post_header_start_pos)))
 }
 
-fn report_format_mismatch(sess: &Session, file: &Path, message: &str) {
+fn report_format_mismatch(report_incremental_info: bool, file: &Path, message: &str) {
     debug!("read_file: {}", message);
 
-    if sess.opts.debugging_opts.incremental_info {
+    if report_incremental_info {
         println!("[incremental] ignoring cache artifact `{}`: {}",
                   file.file_name().unwrap().to_string_lossy(),
                   message);

src/librustc_incremental/persist/fs.rs

@@ -142,6 +142,9 @@ const INT_ENCODE_BASE: u64 = 36;
 pub fn dep_graph_path(sess: &Session) -> PathBuf {
     in_incr_comp_dir_sess(sess, DEP_GRAPH_FILENAME)
 }
+pub fn dep_graph_path_from(incr_comp_session_dir: &Path) -> PathBuf {
+    in_incr_comp_dir(incr_comp_session_dir, DEP_GRAPH_FILENAME)
+}
 
 pub fn work_products_path(sess: &Session) -> PathBuf {
     in_incr_comp_dir_sess(sess, WORK_PRODUCTS_FILENAME)

src/librustc_incremental/persist/load.rs

@@ -14,9 +14,11 @@ use rustc::dep_graph::{PreviousDepGraph, SerializedDepGraph};
 use rustc::session::Session;
 use rustc::ty::TyCtxt;
 use rustc::ty::maps::OnDiskCache;
+use rustc::util::common::time;
 use rustc_serialize::Decodable as RustcDecodable;
 use rustc_serialize::opaque::Decoder;
 use std::path::Path;
+use std;
 
 use super::data::*;
 use super::fs::*;
@@ -39,7 +41,9 @@ pub fn dep_graph_tcx_init<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
     }
 
     let work_products_path = work_products_path(tcx.sess);
-    if let Some((work_products_data, start_pos)) = load_data(tcx.sess, &work_products_path) {
+    let load_result = load_data(tcx.sess.opts.debugging_opts.incremental_info, &work_products_path);
+
+    if let LoadResult::Ok { data: (work_products_data, start_pos) } = load_result {
         // Decode the list of work_products
         let mut work_product_decoder = Decoder::new(&work_products_data[..], start_pos);
         let work_products: Vec<SerializedWorkProduct> =
@@ -74,27 +78,50 @@ pub fn dep_graph_tcx_init<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
     }
 }
 
-fn load_data(sess: &Session, path: &Path) -> Option<(Vec<u8>, usize)> {
-    match file_format::read_file(sess, path) {
-        Ok(Some(data_and_pos)) => return Some(data_and_pos),
+pub enum LoadResult<T> {
+    Ok { data: T },
+    DataOutOfDate,
+    Error { message: String },
+}
+
+
+impl LoadResult<PreviousDepGraph> {
+    pub fn open(self, sess: &Session) -> PreviousDepGraph {
+        match self {
+            LoadResult::Error { message } => {
+                sess.fatal(&message) /* never returns */
+            },
+            LoadResult::DataOutOfDate => {
+                if let Err(err) = delete_all_session_dir_contents(sess) {
+                    sess.err(&format!("Failed to delete invalidated or incompatible \
+                                      incremental compilation session directory contents `{}`: {}.",
+                                      dep_graph_path(sess).display(), err));
+                }
+                PreviousDepGraph::new(SerializedDepGraph::new())
+            }
+            LoadResult::Ok { data } => data
+        }
+    }
+}
+
+
+fn load_data(report_incremental_info: bool, path: &Path) -> LoadResult<(Vec<u8>, usize)> {
+    match file_format::read_file(report_incremental_info, path) {
+        Ok(Some(data_and_pos)) => LoadResult::Ok {
+            data: data_and_pos
+        },
         Ok(None) => {
             // The file either didn't exist or was produced by an incompatible
             // compiler version. Neither is an error.
+            LoadResult::DataOutOfDate
         }
         Err(err) => {
-            sess.err(
-                &format!("could not load dep-graph from `{}`: {}",
-                         path.display(), err));
+            LoadResult::Error {
+                message: format!("could not load dep-graph from `{}`: {}",
+                                  path.display(), err)
+            }
         }
     }
-
-    if let Err(err) = delete_all_session_dir_contents(sess) {
-        sess.err(&format!("could not clear incompatible incremental \
-                           compilation session directory `{}`: {}",
-                          path.display(), err));
-    }
-
-    None
 }
 
 fn delete_dirty_work_product(tcx: TyCtxt,
@@ -103,41 +130,73 @@ fn delete_dirty_work_product(tcx: TyCtxt,
     work_product::delete_workproduct_files(tcx.sess, &swp.work_product);
 }
 
-pub fn load_dep_graph(sess: &Session) -> PreviousDepGraph {
-    let empty = PreviousDepGraph::new(SerializedDepGraph::new());
-
-    if sess.opts.incremental.is_none() {
-        return empty
+/// Either a result that has already be computed or a
+/// handle that will let us wait until it is computed
+/// by a background thread.
+pub enum MaybeAsync<T> {
+    Sync(T),
+    Async(std::thread::JoinHandle<T>)
+}
+impl<T> MaybeAsync<T> {
+    pub fn open(self) -> std::thread::Result<T> {
+        match self {
+            MaybeAsync::Sync(result) => Ok(result),
+            MaybeAsync::Async(handle) => handle.join()
+        }
     }
+}
 
-    if let Some((bytes, start_pos)) = load_data(sess, &dep_graph_path(sess)) {
-        let mut decoder = Decoder::new(&bytes, start_pos);
-        let prev_commandline_args_hash = u64::decode(&mut decoder)
-            .expect("Error reading commandline arg hash from cached dep-graph");
-
-        if prev_commandline_args_hash != sess.opts.dep_tracking_hash() {
-            if sess.opts.debugging_opts.incremental_info {
-                println!("[incremental] completely ignoring cache because of \
-                          differing commandline arguments");
-            }
-            // We can't reuse the cache, purge it.
-            debug!("load_dep_graph_new: differing commandline arg hashes");
+/// Launch a thread and load the dependency graph in the background.
+pub fn load_dep_graph(sess: &Session, time_passes: bool) ->
+    MaybeAsync<LoadResult<PreviousDepGraph>>
+{
+    // Since `sess` isn't `Sync`, we perform all accesses to `sess`
+    // before we fire the background thread.
 
-            delete_all_session_dir_contents(sess)
-                .expect("Failed to delete invalidated incr. comp. session \
-                         directory contents.");
+    if sess.opts.incremental.is_none() {
+        // No incremental compilation.
+        return MaybeAsync::Sync(LoadResult::Ok {
+            data: PreviousDepGraph::new(SerializedDepGraph::new())
+        });
+    }
 
-            // No need to do any further work
-            return empty
-        }
+    // Calling `sess.incr_comp_session_dir()` will panic if `sess.opts.incremental.is_none()`.
+    // Fortunately, we just checked that this isn't the case.
+    let path = dep_graph_path_from(&sess.incr_comp_session_dir());
+    let report_incremental_info = sess.opts.debugging_opts.incremental_info;
+    let expected_hash = sess.opts.dep_tracking_hash();
+
+    MaybeAsync::Async(std::thread::spawn(move || {
+        time(time_passes, "background load prev dep-graph", move || {
+            match load_data(report_incremental_info, &path) {
+                LoadResult::DataOutOfDate => LoadResult::DataOutOfDate,
+                LoadResult::Error { message } => LoadResult::Error { message },
+                LoadResult::Ok { data: (bytes, start_pos) } => {
+
+                    let mut decoder = Decoder::new(&bytes, start_pos);
+                    let prev_commandline_args_hash = u64::decode(&mut decoder)
+                        .expect("Error reading commandline arg hash from cached dep-graph");
+
+                    if prev_commandline_args_hash != expected_hash {
+                        if report_incremental_info {
+                            println!("[incremental] completely ignoring cache because of \
+                                    differing commandline arguments");
+                        }
+                        // We can't reuse the cache, purge it.
+                        debug!("load_dep_graph_new: differing commandline arg hashes");
+
+                        // No need to do any further work
+                        return LoadResult::DataOutOfDate;
+                    }
 
-        let dep_graph = SerializedDepGraph::decode(&mut decoder)
-            .expect("Error reading cached dep-graph");
+                    let dep_graph = SerializedDepGraph::decode(&mut decoder)
+                        .expect("Error reading cached dep-graph");
 
-        PreviousDepGraph::new(dep_graph)
-    } else {
-        empty
-    }
+                    LoadResult::Ok { data: PreviousDepGraph::new(dep_graph) }
+                }
+            }
+        })
+    }))
 }
 
 pub fn load_query_result_cache<'sess>(sess: &'sess Session) -> OnDiskCache<'sess> {
@@ -146,9 +205,8 @@ pub fn load_query_result_cache<'sess>(sess: &'sess Session) -> OnDiskCache<'sess
         return OnDiskCache::new_empty(sess.codemap());
     }
 
-    if let Some((bytes, start_pos)) = load_data(sess, &query_cache_path(sess)) {
-        OnDiskCache::new(sess, bytes, start_pos)
-    } else {
-        OnDiskCache::new_empty(sess.codemap())
+    match load_data(sess.opts.debugging_opts.incremental_info, &query_cache_path(sess)) {
+        LoadResult::Ok{ data: (bytes, start_pos) } => OnDiskCache::new(sess, bytes, start_pos),
+        _ => OnDiskCache::new_empty(sess.codemap())
     }
 }