nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 18:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove should_codegen

Browse Source
This commit is contained in:
bjorn3 2018-11-07 13:35:10 +01:00
parent 29b4c34c54
commit 0b76af2095
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/base.rs
View File

@ -129,14 +129,11 @@ fn trans_fn<'a, 'tcx: 'a>(
verify_func(tcx, writer, &func);
// Step 9. Define function
// TODO: cranelift doesn't yet support some of the things needed
if should_codegen(tcx.sess) {
caches.context.func = func;
module
.define_function(func_id, &mut caches.context)
.unwrap();
caches.context.clear();
}
caches.context.func = func;
module
.define_function(func_id, &mut caches.context)
.unwrap();
caches.context.clear();
}
fn verify_func(tcx: TyCtxt, writer: crate::pretty_clif::CommentWriter, func: &Function) {

28
src/lib.rs
View File

@ -98,12 +98,6 @@ mod prelude {
pub use crate::base::{trans_operand, trans_place};
pub use crate::common::*;
pub use crate::Caches;
pub fn should_codegen(_sess: &Session) -> bool {
true
//::std::env::var("SHOULD_CODEGEN").is_ok()
// || sess.crate_types.get().contains(&CrateType::Executable)
}
}
use crate::constant::ConstantCx;
@ -242,9 +236,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
tcx.sess.abort_if_errors();
if should_codegen(tcx.sess) {
faerie_module.finalize_definitions();
}
faerie_module.finalize_definitions();
return Box::new(OngoingCodegen {
product: faerie_module.finish(),
@ -294,16 +286,14 @@ impl CodegenBackend for CraneliftCodegenBackend {
let file = File::create(&output_name).unwrap();
let mut builder = ar::Builder::new(file);
if should_codegen(sess) {
// Add main object file
let obj = artifact.emit().unwrap();
builder
.append(
&ar::Header::new(b"data.o".to_vec(), obj.len() as u64),
::std::io::Cursor::new(obj),
)
.unwrap();
}
// Add main object file
let obj = artifact.emit().unwrap();
builder
.append(
&ar::Header::new(b"data.o".to_vec(), obj.len() as u64),
::std::io::Cursor::new(obj),
)
.unwrap();
// Non object files need to be added after object files, because ranlib will
// try to read the native architecture from the first file, even if it isn't