diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-01-13 14:33:40 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-01-13 18:47:26 +0100 |
| commit | 7aca2fa7c647954baab2b0c108dced092fb82631 (patch) | |
| tree | d11e593ffb8adce4fe34b9f6f1a54bc912225bd8 /compiler/rustc_codegen_ssa/src | |
| parent | 18d27b2c94cff9a5f6d8e4d2ea45f6f2e434e5f6 (diff) | |
| download | rust-7aca2fa7c647954baab2b0c108dced092fb82631.tar.gz rust-7aca2fa7c647954baab2b0c108dced092fb82631.zip | |
Remove is_dllimport_foreign_item def from cg_ssa
It overwrites the definition from rustc_metadata
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index f47d2ada61a..2ce5fe5ad50 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -29,7 +29,6 @@ use rustc_middle::ty::query::Providers; use rustc_middle::ty::{self, Instance, Ty, TyCtxt}; use rustc_session::cgu_reuse_tracker::CguReuse; use rustc_session::config::{self, EntryFnType}; -use rustc_session::utils::NativeLibKind; use rustc_session::Session; use rustc_target::abi::{Align, LayoutOf, VariantIdx}; @@ -817,32 +816,6 @@ pub fn provide_both(providers: &mut Providers) { } tcx.sess.opts.optimize }; - - providers.dllimport_foreign_items = |tcx, krate| { - let module_map = tcx.foreign_modules(krate); - - let dllimports = tcx - .native_libraries(krate) - .iter() - .filter(|lib| { - if !matches!(lib.kind, NativeLibKind::Dylib | NativeLibKind::Unspecified) { - return false; - } - let cfg = match lib.cfg { - Some(ref cfg) => cfg, - None => return true, - }; - attr::cfg_matches(cfg, &tcx.sess.parse_sess, None) - }) - .filter_map(|lib| lib.foreign_module) - .map(|id| &module_map[&id]) - .flat_map(|module| module.foreign_items.iter().cloned()) - .collect(); - dllimports - }; - - providers.is_dllimport_foreign_item = - |tcx, def_id| tcx.dllimport_foreign_items(def_id.krate).contains(&def_id); } fn determine_cgu_reuse<'tcx>(tcx: TyCtxt<'tcx>, cgu: &CodegenUnit<'tcx>) -> CguReuse { |
