Skip to content

Commit 8f47346

Browse files
authored
Rollup merge of #141769 - bjorn3:codegen_metadata_module_rework, r=workingjubilee,saethlin
Move metadata object generation for dylibs to the linker code This deduplicates some code between codegen backends and may in the future allow adding extra metadata that is only known at link time. Prerequisite of rust-lang/rust#96708.
2 parents 29e0e4f + 7ed4c58 commit 8f47346

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

src/lib.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ extern crate rustc_index;
4848
#[cfg(feature = "master")]
4949
extern crate rustc_interface;
5050
extern crate rustc_macros;
51-
extern crate rustc_metadata;
5251
extern crate rustc_middle;
5352
extern crate rustc_session;
5453
extern crate rustc_span;
@@ -106,7 +105,6 @@ use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen, TargetCon
106105
use rustc_data_structures::fx::FxIndexMap;
107106
use rustc_data_structures::sync::IntoDynSyncSend;
108107
use rustc_errors::DiagCtxtHandle;
109-
use rustc_metadata::EncodedMetadata;
110108
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
111109
use rustc_middle::ty::TyCtxt;
112110
use rustc_middle::util::Providers;
@@ -230,20 +228,9 @@ impl CodegenBackend for GccCodegenBackend {
230228
providers.global_backend_features = |tcx, ()| gcc_util::global_gcc_features(tcx.sess, true)
231229
}
232230

233-
fn codegen_crate(
234-
&self,
235-
tcx: TyCtxt<'_>,
236-
metadata: EncodedMetadata,
237-
need_metadata_module: bool,
238-
) -> Box<dyn Any> {
231+
fn codegen_crate(&self, tcx: TyCtxt<'_>) -> Box<dyn Any> {
239232
let target_cpu = target_cpu(tcx.sess);
240-
let res = codegen_crate(
241-
self.clone(),
242-
tcx,
243-
target_cpu.to_string(),
244-
metadata,
245-
need_metadata_module,
246-
);
233+
let res = codegen_crate(self.clone(), tcx, target_cpu.to_string());
247234

248235
Box::new(res)
249236
}

0 commit comments

Comments
 (0)