moar checkpointing

Author: Daniel-B-Smith

Cargo.lock

@@ -4288,7 +4288,6 @@ dependencies = [
  "rustc_macros",
  "rustc_middle",
  "rustc_proc_macro",
- "rustc_query_system",
  "rustc_serialize",
  "rustc_session",
  "rustc_span",

compiler/rustc_metadata/Cargo.toml

@@ -25,7 +25,6 @@ rustc_middle = { path = "../rustc_middle" }
 # We must use the proc_macro version that we will compile proc-macros against,
 # not the one from our own sysroot.
 rustc_proc_macro = { path = "../rustc_proc_macro" }
-rustc_query_system = { path = "../rustc_query_system" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_data_structures::memmap::{Mmap, MmapMut};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-use rustc_data_structures::sync::{join, par_for_each_in};
+use rustc_data_structures::sync::{par_for_each_in, par_join};
 use rustc_data_structures::temp_dir::MaybeTempDir;
 use rustc_data_structures::thousands::usize_with_underscores;
 use rustc_feature::Features;
@@ -19,6 +19,7 @@ use rustc_hir::definitions::DefPathData;
 use rustc_hir::find_attr;
 use rustc_hir_pretty::id_to_string;
 use rustc_middle::dep_graph::WorkProductId;
+use rustc_middle::ich::StableHashingContext;
 use rustc_middle::middle::dependency_format::Linkage;
 use rustc_middle::mir::interpret;
 use rustc_middle::query::Providers;
@@ -27,7 +28,6 @@ use rustc_middle::ty::AssocContainer;
 use rustc_middle::ty::codec::TyEncoder;
 use rustc_middle::ty::fast_reject::{self, TreatParams};
 use rustc_middle::{bug, span_bug};
-use rustc_query_system::ich::StableHashingContext;
 use rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque};
 use rustc_session::config::{CrateType, OptLevel, TargetModifier};
 use rustc_span::hygiene::HygieneEncodeContext;
@@ -42,7 +42,7 @@ use crate::errors::{FailCreateFileEncoder, FailWriteFile};
 use crate::rmeta::*;
 
 // Struct to enable split borrows.
-struct ContextEncoder<'a> {
+pub(super) struct ContextEncoder<'a> {
     opaque: opaque::FileEncoder,
     stable_hasher: StableHasher,
     hcx: StableHashingContext<'a>,
@@ -120,9 +120,17 @@ impl<'a> Encoder for ContextEncoder<'a> {
 
 impl<'a> ContextEncoder<'a> {
     #[inline]
-    fn position(&self) -> usize {
+    pub(super) fn position(&self) -> usize {
         self.opaque.position()
     }
+
+    pub(super) fn write_m_with<const N: usize>(&mut self, b: &[u8; N], m: usize) {
+        (b[..m]).hash_stable(&mut self.hcx, &mut self.stable_hasher);
+        self.opaque.write_with(|dest| {
+            *dest = *b;
+            m
+        });
+    }
 }
 
 macro_rules! encoder_methods {
@@ -194,11 +202,6 @@ impl<'a, 'tcx> SpanEncoder for EncodeContext<'a, 'tcx> {
     }
 
     fn encode_def_id(&mut self, def_id: DefId) {
-        HashStable::<StableHashingContext<'_>>::hash_stable(
-            &def_id,
-            &mut self.encoder.hcx,
-            &mut self.encoder.stable_hasher,
-        );
         def_id.krate.encode(self);
         def_id.index.encode(self);
     }
@@ -231,17 +234,15 @@ impl<'a, 'tcx> SpanEncoder for EncodeContext<'a, 'tcx> {
                 if offset < last_location {
                     let needed = bytes_needed(offset);
                     SpanTag::indirect(true, needed as u8).encode(self);
-                    self.encoder.opaque.write_with(|dest| {
-                        *dest = offset.to_le_bytes();
-                        needed
-                    });
+                    self.encoder.write_m_with(&offset.to_le_bytes(), needed);
+                    offset.hash_stable(&mut self.encoder.hcx, &mut self.encoder.stable_hasher);
                 } else {
                     let needed = bytes_needed(last_location);
                     SpanTag::indirect(false, needed as u8).encode(self);
-                    self.encoder.opaque.write_with(|dest| {
-                        *dest = last_location.to_le_bytes();
-                        needed
-                    });
+                    self.encoder.write_m_with(&last_location.to_le_bytes(), needed);
+
+                    last_location
+                        .hash_stable(&mut self.encoder.hcx, &mut self.encoder.stable_hasher);
                 }
             }
             Entry::Vacant(v) => {
@@ -648,7 +649,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             adapted.set_some(on_disk_index, self.lazy(adapted_source_file));
         }
 
-        adapted.encode(&mut self.encoder.opaque)
+        adapted.encode(&mut self.encoder)
     }
 
     fn encode_crate_root(&mut self) -> LazyValue<CrateRoot> {
@@ -732,7 +733,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
         // encode_def_path_table.
         let proc_macro_data = stat!("proc-macro-data", || self.encode_proc_macros());
 
-        let tables = stat!("tables", || self.tables.encode(&mut self.encoder.opaque));
+        let tables = stat!("tables", || self.tables.encode(&mut self.encoder));
 
         let debugger_visualizers =
             stat!("debugger-visualizers", || self.encode_debugger_visualizers());
@@ -2018,9 +2019,9 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
         );
 
         (
-            syntax_contexts.encode(&mut self.encoder.opaque),
-            expn_data_table.encode(&mut self.encoder.opaque),
-            expn_hash_table.encode(&mut self.encoder.opaque),
+            syntax_contexts.encode(&mut self.encoder),
+            expn_data_table.encode(&mut self.encoder),
+            expn_hash_table.encode(&mut self.encoder),
         )
     }
 

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -35,7 +35,6 @@ use rustc_middle::mir::ConstValue;
 use rustc_middle::ty::fast_reject::SimplifiedType;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_middle::util::Providers;
-use rustc_serialize::opaque::FileEncoder;
 use rustc_session::config::{SymbolManglingVersion, TargetModifier};
 use rustc_session::cstore::{CrateDepKind, ForeignModule, LinkagePreference, NativeLib};
 use rustc_span::edition::Edition;
@@ -46,6 +45,7 @@ use table::TableBuilder;
 
 use crate::creader::CrateMetadataRef;
 use crate::eii::EiiMapEncodedKeyValue;
+use crate::rmeta::encoder::ContextEncoder;
 
 mod decoder;
 mod def_path_hash_map;
@@ -367,7 +367,7 @@ macro_rules! define_tables {
         }
 
         impl TableBuilders {
-            fn encode(&self, buf: &mut FileEncoder) -> LazyTables {
+            fn encode(&self, buf: &mut ContextEncoder<'_>) -> LazyTables {
                 LazyTables {
                     $($name1: self.$name1.encode(buf),)+
                     $($name2: self.$name2.encode(buf),)+

compiler/rustc_metadata/src/rmeta/table.rs

@@ -2,6 +2,7 @@ use rustc_hir::def::CtorOf;
 use rustc_index::Idx;
 
 use crate::rmeta::decoder::Metadata;
+use crate::rmeta::encoder::ContextEncoder;
 use crate::rmeta::*;
 
 pub(super) trait IsDefault: Default {
@@ -486,15 +487,12 @@ impl<I: Idx, const N: usize, T: FixedSizeEncoding<ByteArray = [u8; N]>> TableBui
         }
     }
 
-    pub(crate) fn encode(&self, buf: &mut FileEncoder) -> LazyTable<I, T> {
+    pub(crate) fn encode(&self, buf: &mut ContextEncoder<'_>) -> LazyTable<I, T> {
         let pos = buf.position();
 
         let width = self.width;
         for block in &self.blocks {
-            buf.write_with(|dest| {
-                *dest = *block;
-                width
-            });
+            buf.write_m_with(block, width);
         }
 
         LazyTable::from_position_and_encoded_size(