Port the #[linkage] attribute to the new attribute system
This commit is contained in:
@@ -281,8 +281,8 @@ fn data_id_for_static(
|
||||
.abi
|
||||
.bytes();
|
||||
|
||||
let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak
|
||||
|| import_linkage == rustc_middle::mir::mono::Linkage::WeakAny
|
||||
let linkage = if import_linkage == rustc_hir::attrs::Linkage::ExternalWeak
|
||||
|| import_linkage == rustc_hir::attrs::Linkage::WeakAny
|
||||
{
|
||||
Linkage::Preemptible
|
||||
} else {
|
||||
@@ -332,8 +332,8 @@ fn data_id_for_static(
|
||||
|
||||
let linkage = if definition {
|
||||
crate::linkage::get_static_linkage(tcx, def_id)
|
||||
} else if attrs.linkage == Some(rustc_middle::mir::mono::Linkage::ExternalWeak)
|
||||
|| attrs.linkage == Some(rustc_middle::mir::mono::Linkage::WeakAny)
|
||||
} else if attrs.linkage == Some(rustc_hir::attrs::Linkage::ExternalWeak)
|
||||
|| attrs.linkage == Some(rustc_hir::attrs::Linkage::WeakAny)
|
||||
{
|
||||
Linkage::Preemptible
|
||||
} else {
|
||||
|
||||
@@ -18,12 +18,11 @@ use rustc_codegen_ssa::{
|
||||
use rustc_data_structures::profiling::SelfProfilerRef;
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
|
||||
use rustc_hir::attrs::Linkage as RLinkage;
|
||||
use rustc_metadata::fs::copy_to_stdout;
|
||||
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
|
||||
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
|
||||
use rustc_middle::mir::mono::{
|
||||
CodegenUnit, Linkage as RLinkage, MonoItem, MonoItemData, Visibility,
|
||||
};
|
||||
use rustc_middle::mir::mono::{CodegenUnit, MonoItem, MonoItemData, Visibility};
|
||||
use rustc_session::Session;
|
||||
use rustc_session::config::{DebugInfo, OutFileName, OutputFilenames, OutputType};
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use rustc_middle::mir::mono::{Linkage as RLinkage, MonoItem, Visibility};
|
||||
use rustc_hir::attrs::Linkage as RLinkage;
|
||||
use rustc_middle::mir::mono::{MonoItem, Visibility};
|
||||
|
||||
use crate::prelude::*;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user