Move Linkage and Visibility to codegen_fn_attrs.

Author: cjgillot

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_middle::middle::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/mod.rs

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

compiler/rustc_codegen_cranelift/src/linkage.rs

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

compiler/rustc_codegen_llvm/src/base.rs

@@ -29,10 +29,9 @@ use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
 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::codegen_fn_attrs::{CodegenFnAttrs, Linkage, Visibility};
 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/mono_item.rs

@@ -6,8 +6,8 @@ use crate::llvm;
 use crate::type_of::LayoutLlvmExt;
 use rustc_codegen_ssa::traits::*;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 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/src/back/symbol_export.rs

@@ -7,7 +7,7 @@ use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::Node;
 use rustc_index::vec::IndexVec;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage, Visibility};
 use rustc_middle::middle::exported_symbols::{
     metadata_symbol_name, ExportedSymbol, SymbolExportLevel,
 };
@@ -221,7 +221,7 @@ fn exported_symbols_provider_local(
     }
 
     if tcx.sess.opts.share_generics() && tcx.local_crate_exports_generics() {
-        use rustc_middle::mir::mono::{Linkage, MonoItem, Visibility};
+        use rustc_middle::mir::mono::MonoItem;
         use rustc_middle::ty::InstanceDef;
 
         // Normally, we require that shared monomorphizations are not hidden,

compiler/rustc_codegen_ssa/src/mono_item.rs

@@ -1,7 +1,7 @@
 use crate::base;
 use crate::traits::*;
 use rustc_hir as hir;
-use rustc_middle::mir::mono::{Linkage, Visibility};
+use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_middle::ty::layout::HasTyCtxt;
 
 use rustc_middle::mir::mono::MonoItem;

compiler/rustc_codegen_ssa/src/traits/declare.rs

@@ -1,6 +1,6 @@
 use super::BackendTypes;
 use rustc_hir::def_id::DefId;
-use rustc_middle::mir::mono::{Linkage, Visibility};
+use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_middle::ty::Instance;
 
 pub trait PreDefineMethods<'tcx>: BackendTypes {

compiler/rustc_middle/src/middle/codegen_fn_attrs.rs

@@ -1,8 +1,32 @@
-use crate::mir::mono::Linkage;
 use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr};
 use rustc_session::config::SanitizerSet;
 use rustc_span::symbol::Symbol;
 
+/// Specifies the linkage type for a `MonoItem`.
+///
+/// See <https://llvm.org/docs/LangRef.html#linkage-types> for more details about these variants.
+#[derive(Copy, Clone, PartialEq, Debug, TyEncodable, TyDecodable, HashStable)]
+pub enum Linkage {
+    External,
+    AvailableExternally,
+    LinkOnceAny,
+    LinkOnceODR,
+    WeakAny,
+    WeakODR,
+    Appending,
+    Internal,
+    Private,
+    ExternalWeak,
+    Common,
+}
+
+#[derive(Copy, Clone, PartialEq, Debug, HashStable)]
+pub enum Visibility {
+    Default,
+    Hidden,
+    Protected,
+}
+
 #[derive(Clone, TyEncodable, TyDecodable, HashStable)]
 pub struct CodegenFnAttrs {
     pub flags: CodegenFnAttrFlags,

compiler/rustc_middle/src/mir/mono.rs

@@ -1,5 +1,6 @@
 use crate::dep_graph::{DepConstructor, DepNode, WorkProduct, WorkProductId};
 use crate::ich::{NodeIdHashingMode, StableHashingContext};
+use crate::middle::codegen_fn_attrs::{Linkage, Visibility};
 use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt};
 use rustc_attr::InlineAttr;
 use rustc_data_structures::base_n;
@@ -226,31 +227,6 @@ pub struct CodegenUnit<'tcx> {
     size_estimate: Option<usize>,
 }
 
-/// Specifies the linkage type for a `MonoItem`.
-///
-/// See <https://llvm.org/docs/LangRef.html#linkage-types> for more details about these variants.
-#[derive(Copy, Clone, PartialEq, Debug, TyEncodable, TyDecodable, HashStable)]
-pub enum Linkage {
-    External,
-    AvailableExternally,
-    LinkOnceAny,
-    LinkOnceODR,
-    WeakAny,
-    WeakODR,
-    Appending,
-    Internal,
-    Private,
-    ExternalWeak,
-    Common,
-}
-
-#[derive(Copy, Clone, PartialEq, Debug, HashStable)]
-pub enum Visibility {
-    Default,
-    Hidden,
-    Protected,
-}
-
 impl<'tcx> CodegenUnit<'tcx> {
     pub fn new(name: Symbol) -> CodegenUnit<'tcx> {
         CodegenUnit { name, items: Default::default(), size_estimate: None }