OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for emitting separate object files for each codegen unit

Browse Source
This commit is contained in:
bjorn3 2018-12-13 14:38:06 +01:00
parent 64f53971e6
commit bc687ee992
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib.rs
View File

@ -24,6 +24,7 @@ use rustc::session::{
CompileIncomplete, CompileIncomplete,
}; };
use rustc::ty::query::Providers; use rustc::ty::query::Providers;
use rustc::mir::mono::{Linkage as RLinkage, Visibility};
use rustc_codegen_ssa::back::linker::LinkerInfo; use rustc_codegen_ssa::back::linker::LinkerInfo;
use rustc_codegen_ssa::CrateInfo; use rustc_codegen_ssa::CrateInfo;
use rustc_codegen_utils::codegen_backend::CodegenBackend; use rustc_codegen_utils::codegen_backend::CodegenBackend;
@ -200,7 +201,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
.declare_function("main", Linkage::Import, &sig) .declare_function("main", Linkage::Import, &sig)
.unwrap(); .unwrap();
codegen_mono_items(tcx, &mut jit_module, &mut log); codegen_cgus(tcx, &mut jit_module, &mut log);
crate::allocator::codegen(tcx.sess, &mut jit_module); crate::allocator::codegen(tcx.sess, &mut jit_module);
jit_module.finalize_definitions(); jit_module.finalize_definitions();
@ -233,7 +234,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
faerie_module.target_config().pointer_type() faerie_module.target_config().pointer_type()
); );
codegen_mono_items(tcx, &mut faerie_module, &mut log); codegen_cgus(tcx, &mut faerie_module, &mut log);
crate::allocator::codegen(tcx.sess, &mut faerie_module); crate::allocator::codegen(tcx.sess, &mut faerie_module);
faerie_module.finalize_definitions(); faerie_module.finalize_definitions();
@ -328,30 +329,40 @@ fn build_isa(sess: &Session) -> Box<isa::TargetIsa + 'static> {
.finish(flags) .finish(flags)
} }
fn codegen_mono_items<'a, 'tcx: 'a>( fn codegen_cgus<'a, 'tcx: 'a>(
tcx: TyCtxt<'a, 'tcx, 'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>,
module: &mut Module<impl Backend + 'static>, module: &mut Module<impl Backend + 'static>,
log: &mut Option<File>, log: &mut Option<File>,
) { ) {
let mut caches = Caches::new();
let mut ccx = ConstantCx::default();
let (_, cgus) = tcx.collect_and_partition_mono_items(LOCAL_CRATE); let (_, cgus) = tcx.collect_and_partition_mono_items(LOCAL_CRATE);
let mono_items = cgus let mono_items = cgus
.iter() .iter()
.map(|cgu| cgu.items().iter()) .map(|cgu| cgu.items().iter())
.flatten() .flatten()
.collect::<FxHashSet<(_, _)>>(); .map(|(&mono_item, &(linkage, vis))| (mono_item, (linkage, vis)))
.collect::<FxHashMap<_, (_, _)>>();
codegen_mono_items(tcx, module, log, mono_items);
crate::main_shim::maybe_create_entry_wrapper(tcx, module);
}
fn codegen_mono_items<'a, 'tcx: 'a>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
module: &mut Module<impl Backend + 'static>,
log: &mut Option<File>,
mono_items: FxHashMap<MonoItem<'tcx>, (RLinkage, Visibility)>,
) {
time("codegen mono items", move || { time("codegen mono items", move || {
for (&mono_item, &(_linkage, _vis)) in mono_items { let mut caches = Caches::new();
let mut ccx = ConstantCx::default();
for (mono_item, (_linkage, _vis)) in mono_items {
unimpl::try_unimpl(tcx, log, || { unimpl::try_unimpl(tcx, log, || {
base::trans_mono_item(tcx, module, &mut caches, &mut ccx, mono_item); base::trans_mono_item(tcx, module, &mut caches, &mut ccx, mono_item);
}); });
} }
crate::main_shim::maybe_create_entry_wrapper(tcx, module);
ccx.finalize(tcx, module); ccx.finalize(tcx, module);
}); });
} }