Use ThinLTO import information when doing incremental compilation.

michaelwoerister · michaelwoerister · commit 4e28b6cbd3fd · 2018-07-13T10:16:08.000+02:00
diff --git a/src/librustc/dep_graph/graph.rs b/src/librustc/dep_graph/graph.rs
@@ -204,13 +204,31 @@ impl DepGraph {
         where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
               R: HashStable<StableHashingContext<'gcx>>,
     {
-        self.with_task_impl(key, cx, arg, false, task,
+        self.with_task_impl(key, cx, arg, false, true, task,
             |key| OpenTask::Regular(Lock::new(RegularOpenTask {
                 node: key,
                 reads: SmallVec::new(),
                 read_set: FxHashSet(),
             })),
-            |data, key, task| data.borrow_mut().complete_task(key, task))
+            |data, key, task| data.borrow_mut().complete_task(key, task, false))
+    }
+
+    pub fn with_forced_task<'gcx, C, A, R>(&self,
+                                           key: DepNode,
+                                           cx: C,
+                                           arg: A,
+                                           task: fn(C, A) -> R)
+                                           -> (R, DepNodeIndex)
+        where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
+              R: HashStable<StableHashingContext<'gcx>>,
+    {
+        self.with_task_impl(key, cx, arg, false, false, task,
+            |key| OpenTask::Regular(Lock::new(RegularOpenTask {
+                node: key,
+                reads: SmallVec::new(),
+                read_set: FxHashSet(),
+            })),
+            |data, key, task| data.borrow_mut().complete_task(key, task, true))
     }
 
     /// Creates a new dep-graph input with value `input`
@@ -226,7 +244,7 @@ impl DepGraph {
             arg
         }
 
-        self.with_task_impl(key, cx, input, true, identity_fn,
+        self.with_task_impl(key, cx, input, true, true, identity_fn,
             |_| OpenTask::Ignore,
             |data, key, _| data.borrow_mut().alloc_node(key, SmallVec::new()))
     }
@@ -237,6 +255,7 @@ impl DepGraph {
         cx: C,
         arg: A,
         no_tcx: bool,
+        do_fingerprinting: bool,
         task: fn(C, A) -> R,
         create_task: fn(DepNode) -> OpenTask,
         finish_task_and_alloc_depnode: fn(&Lock<CurrentDepGraph>,
@@ -282,41 +301,58 @@ impl DepGraph {
 
             let dep_node_index = finish_task_and_alloc_depnode(&data.current, key, open_task);
 
-            let mut stable_hasher = StableHasher::new();
-            result.hash_stable(&mut hcx, &mut stable_hasher);
+            if do_fingerprinting {
+                let mut stable_hasher = StableHasher::new();
+                result.hash_stable(&mut hcx, &mut stable_hasher);
 
-            let current_fingerprint = stable_hasher.finish();
+                let current_fingerprint = stable_hasher.finish();
 
-            // Store the current fingerprint
-            {
-                let mut fingerprints = self.fingerprints.borrow_mut();
+                // Store the current fingerprint
+                {
+                    let mut fingerprints = self.fingerprints.borrow_mut();
+
+                    if dep_node_index.index() >= fingerprints.len() {
+                        fingerprints.resize(dep_node_index.index() + 1, Fingerprint::ZERO);
+                    }
 
-                if dep_node_index.index() >= fingerprints.len() {
-                    fingerprints.resize(dep_node_index.index() + 1, Fingerprint::ZERO);
+                    debug_assert!(fingerprints[dep_node_index] == Fingerprint::ZERO,
+                                  "DepGraph::with_task() - Duplicate fingerprint \
+                                   insertion for {:?}", key);
+                    fingerprints[dep_node_index] = current_fingerprint;
                 }
 
-                debug_assert!(fingerprints[dep_node_index] == Fingerprint::ZERO,
-                              "DepGraph::with_task() - Duplicate fingerprint \
-                               insertion for {:?}", key);
-                fingerprints[dep_node_index] = current_fingerprint;
-            }
+                // Determine the color of the new DepNode.
+                if let Some(prev_index) = data.previous.node_to_index_opt(&key) {
+                    let prev_fingerprint = data.previous.fingerprint_by_index(prev_index);
 
-            // Determine the color of the new DepNode.
-            if let Some(prev_index) = data.previous.node_to_index_opt(&key) {
-                let prev_fingerprint = data.previous.fingerprint_by_index(prev_index);
+                    let color = if current_fingerprint == prev_fingerprint {
+                        DepNodeColor::Green(dep_node_index)
+                    } else {
+                        DepNodeColor::Red
+                    };
 
-                let color = if current_fingerprint == prev_fingerprint {
-                    DepNodeColor::Green(dep_node_index)
-                } else {
-                    DepNodeColor::Red
-                };
+                    let mut colors = data.colors.borrow_mut();
+                    debug_assert!(colors.get(prev_index).is_none(),
+                                  "DepGraph::with_task() - Duplicate DepNodeColor \
+                                   insertion for {:?}", key);
+
+                    colors.insert(prev_index, color);
+                }
+            } else {
+                // Always store a ZERO fingerprint
+                {
+                    let mut fingerprints = self.fingerprints.borrow_mut();
 
-                let mut colors = data.colors.borrow_mut();
-                debug_assert!(colors.get(prev_index).is_none(),
-                              "DepGraph::with_task() - Duplicate DepNodeColor \
-                               insertion for {:?}", key);
+                    if dep_node_index.index() >= fingerprints.len() {
+                        fingerprints.resize(dep_node_index.index() + 1, Fingerprint::ZERO);
+                    }
+
+                    fingerprints[dep_node_index] = Fingerprint::ZERO;
+                }
 
-                colors.insert(prev_index, color);
+                if let Some(prev_index) = data.previous.node_to_index_opt(&key) {
+                    data.colors.borrow_mut().insert(prev_index, DepNodeColor::Red);
+                }
             }
 
             (result, dep_node_index)
@@ -378,7 +414,7 @@ impl DepGraph {
     }
 
     /// Execute something within an "eval-always" task which is a task
-    // that runs whenever anything changes.
+    /// that runs whenever anything changes.
     pub fn with_eval_always_task<'gcx, C, A, R>(&self,
                                    key: DepNode,
                                    cx: C,
@@ -388,7 +424,7 @@ impl DepGraph {
         where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
               R: HashStable<StableHashingContext<'gcx>>,
     {
-        self.with_task_impl(key, cx, arg, false, task,
+        self.with_task_impl(key, cx, arg, false, true, task,
             |key| OpenTask::EvalAlways { node: key },
             |data, key, task| data.borrow_mut().complete_eval_always_task(key, task))
     }
@@ -939,7 +975,11 @@ impl CurrentDepGraph {
         }
     }
 
-    fn complete_task(&mut self, key: DepNode, task: OpenTask) -> DepNodeIndex {
+    fn complete_task(&mut self,
+                     key: DepNode,
+                     task: OpenTask,
+                     allow_existing_dep_node: bool)
+                     -> DepNodeIndex {
         if let OpenTask::Regular(task) = task {
             let RegularOpenTask {
                 node,
@@ -970,7 +1010,16 @@ impl CurrentDepGraph {
                 }
             }
 
-            self.alloc_node(node, reads)
+            if allow_existing_dep_node {
+                if let Some(&dep_node_index) = self.node_to_node_index.get(&node) {
+                    self.edges[dep_node_index] = reads;
+                    dep_node_index
+                } else {
+                    self.alloc_node(node, reads)
+                }
+            } else {
+                self.alloc_node(node, reads)
+            }
         } else {
             bug!("complete_task() - Expected regular task to be popped")
         }
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
@@ -1973,7 +1973,7 @@ pub fn build_session_options_and_crate_config(
         (&None, &None) => None,
     }.map(|m| PathBuf::from(m));
 
-    if cg.lto != Lto::No && incremental.is_some() {
+    if cg.lto == Lto::Fat && incremental.is_some() {
         early_error(
             error_format,
             "can't perform LTO when compiling incrementally",
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
@@ -583,11 +583,6 @@ impl Session {
             return config::Lto::No;
         }
 
-        // Right now ThinLTO isn't compatible with incremental compilation.
-        if self.opts.incremental.is_some() {
-            return config::Lto::No;
-        }
-
         // Now we're in "defaults" territory. By default we enable ThinLTO for
         // optimized compiles (anything greater than O0).
         match self.opts.optimize {
diff --git a/src/librustc/ty/query/config.rs b/src/librustc/ty/query/config.rs
@@ -702,12 +702,6 @@ impl<'tcx> QueryDescription<'tcx> for queries::codegen_unit<'tcx> {
     }
 }
 
-impl<'tcx> QueryDescription<'tcx> for queries::compile_codegen_unit<'tcx> {
-    fn describe(_tcx: TyCtxt, _: InternedString) -> String {
-        format!("compile_codegen_unit")
-    }
-}
-
 impl<'tcx> QueryDescription<'tcx> for queries::output_filenames<'tcx> {
     fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
         format!("output_filenames")
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs
@@ -27,7 +27,7 @@ use middle::stability::{self, DeprecationEntry};
 use middle::lang_items::{LanguageItems, LangItem};
 use middle::exported_symbols::{SymbolExportLevel, ExportedSymbol};
 use mir::interpret::ConstEvalResult;
-use mir::mono::{CodegenUnit, Stats};
+use mir::mono::CodegenUnit;
 use mir;
 use mir::interpret::{GlobalId, Allocation};
 use session::{CompileResult, CrateDisambiguator};
@@ -436,7 +436,6 @@ define_queries! { <'tcx>
         -> (Arc<DefIdSet>, Arc<Vec<Arc<CodegenUnit<'tcx>>>>),
     [] fn is_codegened_item: IsCodegenedItem(DefId) -> bool,
     [] fn codegen_unit: CodegenUnit(InternedString) -> Arc<CodegenUnit<'tcx>>,
-    [] fn compile_codegen_unit: CompileCodegenUnit(InternedString) -> Stats,
     [] fn output_filenames: output_filenames_node(CrateNum)
         -> Arc<OutputFilenames>,
 
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs
@@ -811,6 +811,10 @@ impl ThinLTOImports {
         }
     }
 
+    pub fn modules_imported_by(&self, llvm_module_name: &str) -> &[String] {
+        self.imports.get(llvm_module_name).map(|v| &v[..]).unwrap_or(&[])
+    }
+
     /// Load the ThinLTO import map from ThinLTOData.
     unsafe fn from_thin_lto_data(data: *const llvm::ThinLTOData) -> ThinLTOImports {
         let raw_data: *const llvm::ThinLTOModuleImports =
diff --git a/src/librustc_codegen_llvm/base.rs b/src/librustc_codegen_llvm/base.rs
diff --git a/src/librustc_mir/monomorphize/partitioning.rs b/src/librustc_mir/monomorphize/partitioning.rs
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs

Original file line number	Diff line number	Diff line change
`@@ -702,12 +702,6 @@ impl<'tcx> QueryDescription<'tcx> for queries::codegen_unit<'tcx> {`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`
`705`		`-impl<'tcx> QueryDescription<'tcx> for queries::compile_codegen_unit<'tcx> {`
`706`		`- fn describe(_tcx: TyCtxt, _: InternedString) -> String {`
`707`		`- format!("compile_codegen_unit")`
`708`		`- }`
`709`		`-}`
`710`		`-`
`711`	`705`	`impl<'tcx> QueryDescription<'tcx> for queries::output_filenames<'tcx> {`
`712`	`706`	`fn describe(_tcx: TyCtxt, _: CrateNum) -> String {`
`713`	`707`	`format!("output_filenames")`
Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,10 @@ impl ThinLTOImports {`
`811`	`811`	`}`
`812`	`812`	`}`
`813`	`813`
	`814`	`+ pub fn modules_imported_by(&self, llvm_module_name: &str) -> &[String] {`
	`815`	`+ self.imports.get(llvm_module_name).map(\|v\| &v[..]).unwrap_or(&[])`
	`816`	`+ }`
	`817`	`+`
`814`	`818`	`/// Load the ThinLTO import map from ThinLTOData.`
`815`	`819`	`unsafe fn from_thin_lto_data(data: *const llvm::ThinLTOData) -> ThinLTOImports {`
`816`	`820`	`let raw_data: *const llvm::ThinLTOModuleImports =`