Auto merge of #46657 - nikomatsakis:resolve-lifetimes-query, r=arielb1

move `resolve_lifetimes` into a proper query

Now that we made `resolve_lifetimes` into a query, elision errors no
longer abort compilation, which affects some tests.

Also, remove `dep_graph_crosscontaminate_tables` -- there is no a path in
the dep-graph, though red-green handles it. The same scenario
is (correctly) tested by issue-42602.rs in any case.

r? @michaelwoerister

Author: bors

src/librustc/dep_graph/dep_node.rs

@@ -588,9 +588,10 @@ define_dep_nodes!( <'tcx>
     [] NativeLibraryKind(DefId),
     [input] LinkArgs,
 
-    [input] NamedRegion(DefIndex),
-    [input] IsLateBound(DefIndex),
-    [input] ObjectLifetimeDefaults(DefIndex),
+    [] ResolveLifetimes(CrateNum),
+    [] NamedRegion(DefIndex),
+    [] IsLateBound(DefIndex),
+    [] ObjectLifetimeDefaults(DefIndex),
 
     [] Visibility(DefId),
     [] DepKind(CrateNum),

src/librustc/hir/mod.rs

@@ -28,7 +28,7 @@ pub use self::UnsafeSource::*;
 pub use self::Visibility::{Public, Inherited};
 
 use hir::def::Def;
-use hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX};
+use hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX};
 use util::nodemap::{NodeMap, FxHashSet};
 
 use syntax_pos::{Span, DUMMY_SP};
@@ -92,6 +92,16 @@ pub struct HirId {
     pub local_id: ItemLocalId,
 }
 
+impl HirId {
+    pub fn owner_def_id(self) -> DefId {
+        DefId::local(self.owner)
+    }
+
+    pub fn owner_local_def_id(self) -> LocalDefId {
+        LocalDefId::from_def_id(DefId::local(self.owner))
+    }
+}
+
 impl serialize::UseSpecializedEncodable for HirId {
     fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
         let HirId {