bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #53962 - michaelwoerister:close-thinlto-file-descriptors, r=alexcrichton

Browse source 
ThinLTO: Don't keep files open after mmaping them.

Fixes #53947.

r? @alexcrichton
This commit is contained in:
bors 2018-09-05 20:52:42 +00:00
commit 6e0f1cc158
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_codegen_llvm/back/lto.rs
View file

@ -29,7 +29,7 @@ use {ModuleCodegen, ModuleLlvm, ModuleKind};
use libc;
use std::ffi::{CStr, CString};
use std::fs::{self, File};
use std::fs;
use std::ptr;
use std::slice;
use std::sync::Arc;
@ -619,7 +619,7 @@ fn run_pass_manager(cgcx: &CodegenContext,
pub enum SerializedModule {
Local(ModuleBuffer),
FromRlib(Vec<u8>),
FromUncompressedFile(memmap::Mmap, File),
FromUncompressedFile(memmap::Mmap),
}
impl SerializedModule {
@ -627,7 +627,7 @@ impl SerializedModule {
match *self {
SerializedModule::Local(ref m) => m.data(),
SerializedModule::FromRlib(ref m) => m,
SerializedModule::FromUncompressedFile(ref m, _) => m,
SerializedModule::FromUncompressedFile(ref m) => m,
}
}
}

2
src/librustc_codegen_llvm/back/write.rs
View file

@ -2494,7 +2494,7 @@ pub(crate) fn submit_pre_lto_module_to_llvm(tcx: TyCtxt,
// Schedule the module to be loaded
drop(tcx.tx_to_llvm_workers.lock().send(Box::new(Message::AddImportOnlyModule {
module_data: SerializedModule::FromUncompressedFile(mmap, file),
module_data: SerializedModule::FromUncompressedFile(mmap),
work_product: module.source,
})));
}