From 490c23f054bd47109f4df56f0d69873ae0367937 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sat, 29 Oct 2016 12:21:37 +0200
Subject: [PATCH] rustc_incremental: fix compilation

---
 src/librustc_incremental/assert_dep_graph.rs          | 2 ++
 src/librustc_incremental/calculate_svh/mod.rs         | 2 ++
 src/librustc_incremental/calculate_svh/svh_visitor.rs | 4 ++++
 src/librustc_incremental/persist/dirty_clean.rs       | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/src/librustc_incremental/assert_dep_graph.rs b/src/librustc_incremental/assert_dep_graph.rs
index 87e6b2befdc3..bac72ed2bedf 100644
--- a/src/librustc_incremental/assert_dep_graph.rs
+++ b/src/librustc_incremental/assert_dep_graph.rs
@@ -174,6 +174,8 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for IfThisChanged<'a, 'tcx> {
     fn visit_impl_item(&mut self, impl_item: &'tcx hir::ImplItem) {
         self.process_attrs(impl_item.id, &impl_item.attrs);
     }
+
+    fn visit_expr_id(&mut self, _: hir::ExprId) { }
 }
 
 fn check_paths<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
diff --git a/src/librustc_incremental/calculate_svh/mod.rs b/src/librustc_incremental/calculate_svh/mod.rs
index 250ef061e510..89b5de5c328b 100644
--- a/src/librustc_incremental/calculate_svh/mod.rs
+++ b/src/librustc_incremental/calculate_svh/mod.rs
@@ -226,5 +226,7 @@ impl<'a, 'tcx> Visitor<'tcx> for HashItemsVisitor<'a, 'tcx> {
         self.calculate_node_id(item.id, |v| v.visit_foreign_item(item));
         visit::walk_foreign_item(self, item);
     }
+
+    fn visit_expr_id(&mut self, _: hir::ExprId) { }
 }
 
diff --git a/src/librustc_incremental/calculate_svh/svh_visitor.rs b/src/librustc_incremental/calculate_svh/svh_visitor.rs
index e2b141f2ea62..dedd0c65df5e 100644
--- a/src/librustc_incremental/calculate_svh/svh_visitor.rs
+++ b/src/librustc_incremental/calculate_svh/svh_visitor.rs
@@ -509,6 +509,10 @@ macro_rules! hash_span {
 }
 
 impl<'a, 'hash, 'tcx> visit::Visitor<'tcx> for StrictVersionHashVisitor<'a, 'hash, 'tcx> {
+    fn visit_expr_id(&mut self, _: hir::ExprId) {
+        // Body exprs are hashed independently
+    }
+
     fn visit_variant_data(&mut self,
                           s: &'tcx VariantData,
                           name: Name,
diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs
index 85c35bf79ce8..b5b5518ac440 100644
--- a/src/librustc_incremental/persist/dirty_clean.rs
+++ b/src/librustc_incremental/persist/dirty_clean.rs
@@ -185,6 +185,8 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for DirtyCleanVisitor<'a, 'tcx> {
 
     fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem) {
     }
+
+    fn visit_expr_id(&mut self, _: hir::ExprId) { }
 }
 
 pub fn check_dirty_clean_metadata<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
@@ -229,6 +231,8 @@ impl<'a, 'tcx, 'm> ItemLikeVisitor<'tcx> for DirtyCleanMetadataVisitor<'a, 'tcx,
 
     fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem) {
     }
+
+    fn visit_expr_id(&mut self, _: hir::ExprId) { }
 }
 
 impl<'a, 'tcx, 'm> DirtyCleanMetadataVisitor<'a, 'tcx, 'm> {