diff options
| author | bors <bors@rust-lang.org> | 2021-07-06 22:20:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-06 22:20:43 +0000 |
| commit | b20e3ff2af39e1de6280d52aea2e87585e98056d (patch) | |
| tree | 475f9dc55c47e934a81eb86820a7f63483faf197 /compiler/rustc_codegen_ssa/src/back/write.rs | |
| parent | 885399992c4c1dde37b506b8507a7d69415646b9 (diff) | |
| parent | 25e45baf55280eb310cfb182024194c69347c890 (diff) | |
| download | rust-b20e3ff2af39e1de6280d52aea2e87585e98056d.tar.gz rust-b20e3ff2af39e1de6280d52aea2e87585e98056d.zip | |
Auto merge of #86911 - bjorn3:crate_info_refactor, r=petrochenkov
Refactor linker code This merges `LinkerInfo` into `CrateInfo` as there is no reason to keep them separate. `LinkerInfo::to_linker` is merged into `get_linker` as both have different logic for each linker type and `to_linker` is directly called after `get_linker`. Also contains a couple of small cleanups. See the individual commits for all changes.
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index d27eb7da810..41823f7d80d 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -1,5 +1,4 @@ use super::link::{self, ensure_removed}; -use super::linker::LinkerInfo; use super::lto::{self, SerializedModule}; use super::symbol_export::symbol_name_for_instance_in_crate; @@ -430,8 +429,7 @@ pub fn start_async_codegen<B: ExtraBackendMethods>( let no_builtins = tcx.sess.contains_name(crate_attrs, sym::no_builtins); let is_compiler_builtins = tcx.sess.contains_name(crate_attrs, sym::compiler_builtins); - let linker_info = LinkerInfo::new(tcx, target_cpu); - let crate_info = CrateInfo::new(tcx); + let crate_info = CrateInfo::new(tcx, target_cpu); let regular_config = ModuleConfig::new(ModuleKind::Regular, sess, no_builtins, is_compiler_builtins); @@ -461,7 +459,6 @@ pub fn start_async_codegen<B: ExtraBackendMethods>( OngoingCodegen { backend, metadata, - linker_info, crate_info, coordinator_send, @@ -1799,7 +1796,6 @@ impl SharedEmitterMain { pub struct OngoingCodegen<B: ExtraBackendMethods> { pub backend: B, pub metadata: EncodedMetadata, - pub linker_info: LinkerInfo, pub crate_info: CrateInfo, pub coordinator_send: Sender<Box<dyn Any + Send>>, pub codegen_worker_receive: Receiver<Message<B>>, @@ -1842,7 +1838,6 @@ impl<B: ExtraBackendMethods> OngoingCodegen<B> { ( CodegenResults { metadata: self.metadata, - linker_info: self.linker_info, crate_info: self.crate_info, modules: compiled_modules.modules, |