Move stable hasher out of rustc_middle

Cargo.lock

@@ -3525,6 +3525,7 @@ dependencies = [
  "rustc_ast",
  "rustc_attr",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3557,6 +3558,7 @@ dependencies = [
  "rustc_apfloat",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_fs_util",
@@ -3574,6 +3576,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rustc_crate"
+version = "0.0.0"
+dependencies = [
+ "bitflags",
+ "rustc_ast",
+ "rustc_attr",
+ "rustc_data_structures",
+ "rustc_errors",
+ "rustc_feature",
+ "rustc_hir",
+ "rustc_macros",
+ "rustc_serialize",
+ "rustc_session",
+ "rustc_span",
+ "rustc_target",
+ "smallvec 1.4.2",
+]
+
 [[package]]
 name = "rustc_data_structures"
 version = "0.0.0"
@@ -3611,6 +3632,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
@@ -3780,6 +3802,7 @@ dependencies = [
  "rustc_builtin_macros",
  "rustc_codegen_llvm",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3825,6 +3848,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3878,6 +3902,7 @@ dependencies = [
  "memmap",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3911,6 +3936,7 @@ dependencies = [
  "rustc_arena",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3938,6 +3964,7 @@ dependencies = [
  "rustc_apfloat",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_graphviz",
@@ -4011,6 +4038,7 @@ version = "0.0.0"
 dependencies = [
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4029,6 +4057,7 @@ name = "rustc_plugin_impl"
 version = "0.0.0"
 dependencies = [
  "rustc_ast",
+ "rustc_crate",
  "rustc_errors",
  "rustc_hir",
  "rustc_lint",
@@ -4043,6 +4072,7 @@ name = "rustc_privacy"
 version = "0.0.0"
 dependencies = [
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4080,6 +4110,7 @@ dependencies = [
  "rustc_ast_lowering",
  "rustc_ast_pretty",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -4102,6 +4133,7 @@ dependencies = [
  "rls-span",
  "rustc_ast",
  "rustc_ast_pretty",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_hir_pretty",
@@ -4167,6 +4199,7 @@ dependencies = [
  "punycode",
  "rustc-demangle",
  "rustc_ast",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_middle",
@@ -4205,6 +4238,7 @@ version = "0.0.0"
 dependencies = [
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4262,6 +4296,7 @@ dependencies = [
  "rustc_arena",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",

compiler/rustc_attr/src/builtin.rs

@@ -2,6 +2,7 @@
 
 use rustc_ast::{self as ast, Attribute, Lit, LitKind, MetaItem, MetaItemKind, NestedMetaItem};
 use rustc_ast_pretty::pprust;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::{struct_span_err, Applicability};
 use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
 use rustc_macros::HashStable_Generic;
@@ -1049,3 +1050,21 @@ fn allow_unstable<'a>(
         name
     }))
 }
+
+impl<Ctxt> HashStable<Ctxt> for InlineAttr {
+    fn hash_stable(&self, hcx: &mut Ctxt, hasher: &mut StableHasher) {
+        std::mem::discriminant(self).hash_stable(hcx, hasher);
+    }
+}
+
+impl<Ctxt> HashStable<Ctxt> for InstructionSetAttr {
+    fn hash_stable(&self, hcx: &mut Ctxt, hasher: &mut StableHasher) {
+        std::mem::discriminant(self).hash_stable(hcx, hasher);
+    }
+}
+
+impl<Ctxt> HashStable<Ctxt> for OptimizeAttr {
+    fn hash_stable(&self, hcx: &mut Ctxt, hasher: &mut StableHasher) {
+        std::mem::discriminant(self).hash_stable(hcx, hasher);
+    }
+}

compiler/rustc_codegen_cranelift/src/abi/mod.rs

@@ -5,7 +5,7 @@ mod comments;
 mod pass_mode;
 mod returning;
 
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_target::spec::abi::Abi;
 
 use cranelift_codegen::ir::{AbiParam, ArgumentPurpose};

compiler/rustc_codegen_cranelift/src/allocator.rs

@@ -13,7 +13,7 @@ pub(crate) fn codegen(
     unwind_context: &mut UnwindContext<'_>,
 ) -> bool {
     let any_dynamic_crate = tcx.dependency_formats(LOCAL_CRATE).iter().any(|(_, list)| {
-        use rustc_middle::middle::dependency_format::Linkage;
+        use rustc_crate::dependency_format::Linkage;
         list.iter().any(|&linkage| linkage == Linkage::Dynamic)
     });
     if any_dynamic_crate {

compiler/rustc_codegen_cranelift/src/constant.rs

@@ -4,7 +4,7 @@ use rustc_span::DUMMY_SP;
 
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::ErrorReported;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage as RLinkage};
 use rustc_middle::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, ErrorHandled, GlobalAlloc, Pointer, Scalar,
 };
@@ -292,8 +292,8 @@ fn data_id_for_static(
     let rlinkage = tcx.codegen_fn_attrs(def_id).linkage;
     let linkage = if definition {
         crate::linkage::get_static_linkage(tcx, def_id)
-    } else if rlinkage == Some(rustc_middle::mir::mono::Linkage::ExternalWeak)
-        || rlinkage == Some(rustc_middle::mir::mono::Linkage::WeakAny)
+    } else if rlinkage == Some(RLinkage::ExternalWeak)
+        || rlinkage == Some(RLinkage::WeakAny)
     {
         Linkage::Preemptible
     } else {

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -5,9 +5,9 @@ use std::path::PathBuf;
 
 use rustc_codegen_ssa::back::linker::LinkerInfo;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule, CrateInfo, ModuleKind};
+use rustc_crate::cstore::EncodedMetadata;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::EncodedMetadata;
 use rustc_middle::mir::mono::CodegenUnit;
 use rustc_session::cgu_reuse_tracker::CguReuse;
 use rustc_session::config::{DebugInfo, OutputType};

compiler/rustc_codegen_cranelift/src/driver/jit.rs

@@ -109,7 +109,7 @@ pub(super) fn run_jit(tcx: TyCtxt<'_>) -> ! {
 }
 
 fn load_imported_symbols_for_jit(tcx: TyCtxt<'_>) -> Vec<(String, *const u8)> {
-    use rustc_middle::middle::dependency_format::Linkage;
+    use rustc_crate::dependency_format::Linkage;
 
     let mut dylib_paths = Vec::new();
 

compiler/rustc_codegen_cranelift/src/driver/mod.rs

@@ -3,8 +3,9 @@
 
 use std::any::Any;
 
-use rustc_middle::middle::cstore::EncodedMetadata;
-use rustc_middle::mir::mono::{Linkage as RLinkage, MonoItem, Visibility};
+use rustc_crate::cstore::EncodedMetadata;
+use rustc_crate::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
+use rustc_middle::mir::mono::MonoItem;
 
 use crate::prelude::*;
 

compiler/rustc_codegen_cranelift/src/lib.rs

@@ -18,6 +18,7 @@ extern crate snap;
 extern crate rustc_middle;
 extern crate rustc_ast;
 extern crate rustc_codegen_ssa;
+extern crate rustc_crate;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_fs_util;
@@ -37,9 +38,9 @@ use std::any::Any;
 
 use rustc_codegen_ssa::traits::CodegenBackend;
 use rustc_codegen_ssa::CodegenResults;
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_errors::ErrorReported;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_middle::ty::query::Providers;
 use rustc_session::config::OutputFilenames;
 use rustc_session::Session;

compiler/rustc_codegen_cranelift/src/linkage.rs

@@ -1,4 +1,5 @@
-use rustc_middle::mir::mono::{Linkage as RLinkage, MonoItem, Visibility};
+use rustc_crate::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
+use rustc_middle::mir::mono::MonoItem;
 
 use crate::prelude::*;
 

compiler/rustc_codegen_cranelift/src/metadata.rs

@@ -5,10 +5,10 @@ use std::fs::File;
 use std::path::Path;
 
 use rustc_codegen_ssa::METADATA_FILENAME;
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_data_structures::owning_ref::OwningRef;
 use rustc_data_structures::rustc_erase_owner;
 use rustc_data_structures::sync::MetadataRef;
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config;
 use rustc_target::spec::Target;

compiler/rustc_codegen_llvm/Cargo.toml

@@ -15,6 +15,7 @@ measureme = "9.0.0"
 snap = "1"
 tracing = "0.1"
 rustc_middle = { path = "../rustc_middle" }
+rustc_crate = { path = "../rustc_crate" }
 rustc-demangle = "0.1.18"
 rustc_attr = { path = "../rustc_attr" }
 rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -3,11 +3,11 @@
 use std::ffi::CString;
 
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_data_structures::const_cstr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_hir::def_id::DefId;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::ty::layout::HasTyCtxt;
 use rustc_middle::ty::query::Providers;
 use rustc_middle::ty::{self, TyCtxt};

compiler/rustc_codegen_llvm/src/base.rs

@@ -27,12 +27,11 @@ use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use rustc_codegen_ssa::mono_item::MonoItemExt;
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrs, Linkage, Visibility};
+use rustc_crate::cstore::EncodedMetadata;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_middle::dep_graph;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
-use rustc_middle::middle::cstore::EncodedMetadata;
 use rustc_middle::middle::exported_symbols;
-use rustc_middle::mir::mono::{Linkage, Visibility};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, SanitizerSet};
 use rustc_span::symbol::Symbol;

compiler/rustc_codegen_llvm/src/consts.rs

@@ -7,11 +7,11 @@ use crate::type_of::LayoutLlvmExt;
 use crate::value::Value;
 use libc::c_uint;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_data_structures::const_cstr;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::Node;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::mir::interpret::{
     read_target_uint, Allocation, ErrorHandled, GlobalAlloc, Pointer,
 };

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

@@ -20,6 +20,7 @@ use crate::value::Value;
 
 use rustc_ast as ast;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::ich::NodeIdHashingMode;
 use rustc_data_structures::const_cstr;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
@@ -28,7 +29,6 @@ use rustc_fs_util::path_to_c_string;
 use rustc_hir::def::CtorKind;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_index::vec::{Idx, IndexVec};
-use rustc_middle::ich::NodeIdHashingMode;
 use rustc_middle::mir::{self, Field, GeneratorLayout};
 use rustc_middle::ty::layout::{self, IntegerExt, PrimitiveExt, TyAndLayout};
 use rustc_middle::ty::subst::GenericArgKind;

compiler/rustc_codegen_llvm/src/lib.rs

@@ -23,10 +23,10 @@ use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::ModuleCodegen;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule};
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoaderDyn};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{ErrorReported, FatalError, Handler};
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_session::config::{OptLevel, OutputFilenames, PrintRequest};
 use rustc_session::Session;

compiler/rustc_codegen_llvm/src/metadata.rs

@@ -1,7 +1,7 @@
 use crate::llvm;
 use crate::llvm::archive_ro::ArchiveRO;
 use crate::llvm::{mk_section_iter, False, ObjectFile};
-use rustc_middle::middle::cstore::MetadataLoader;
+use rustc_crate::cstore::MetadataLoader;
 use rustc_target::spec::Target;
 
 use rustc_codegen_ssa::METADATA_FILENAME;

compiler/rustc_codegen_llvm/src/mono_item.rs

@@ -5,9 +5,9 @@ use crate::context::CodegenCx;
 use crate::llvm;
 use crate::type_of::LayoutLlvmExt;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 pub use rustc_middle::mir::mono::MonoItem;
-use rustc_middle::mir::mono::{Linkage, Visibility};
 use rustc_middle::ty::layout::FnAbiExt;
 use rustc_middle::ty::{self, Instance, TypeFoldable};
 use rustc_target::abi::LayoutOf;

compiler/rustc_codegen_ssa/Cargo.toml

@@ -20,6 +20,7 @@ pathdiff = "0.2.0"
 
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_ast = { path = "../rustc_ast" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_span = { path = "../rustc_span" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_apfloat = { path = "../rustc_apfloat" }