user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc_codegen_llvm: use safe references for ThinLTOData.

Browse source
This commit is contained in:
Irina Popa 2018-07-17 16:43:49 +03:00
parent 2e3a6af7fa
commit ba006440ee
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,11 +423,10 @@ fn thin_lto(diag_handler: &Handler,
thin_modules.len() as u32,
symbol_white_list.as_ptr(),
symbol_white_list.len() as u32,
);
if data.is_null() {
let msg = "failed to prepare thin LTO context".to_string();
return Err(write::llvm_err(&diag_handler, msg))
}
).ok_or_else(|| {
write::llvm_err(&diag_handler, "failed to prepare thin LTO context".to_string())
})?;
let data = ThinData(data);
info!("thin LTO data created");
timeline.record("data");
@ -566,7 +565,7 @@ struct ThinShared {
module_names: Vec<CString>,
}
struct ThinData(*mut llvm::ThinLTOData);
struct ThinData(&'static mut llvm::ThinLTOData);
unsafe impl Send for ThinData {}
unsafe impl Sync for ThinData {}
@ -574,7 +573,7 @@ unsafe impl Sync for ThinData {}
impl Drop for ThinData {
fn drop(&mut self) {
unsafe {
llvm::LLVMRustFreeThinLTOData(self.0);
llvm::LLVMRustFreeThinLTOData(&mut *(self.0 as *mut _));
}
}
}

12
src/librustc_codegen_llvm/llvm/ffi.rs
View file

@ -1580,24 +1580,24 @@ extern "C" {
NumModules: c_uint,
PreservedSymbols: *const *const c_char,
PreservedSymbolsLen: c_uint,
) -> *mut ThinLTOData;
) -> Option<&'static mut ThinLTOData>;
pub fn LLVMRustPrepareThinLTORename(
Data: *const ThinLTOData,
Data: &ThinLTOData,
Module: &Module,
) -> bool;
pub fn LLVMRustPrepareThinLTOResolveWeak(
Data: *const ThinLTOData,
Data: &ThinLTOData,
Module: &Module,
) -> bool;
pub fn LLVMRustPrepareThinLTOInternalize(
Data: *const ThinLTOData,
Data: &ThinLTOData,
Module: &Module,
) -> bool;
pub fn LLVMRustPrepareThinLTOImport(
Data: *const ThinLTOData,
Data: &ThinLTOData,
Module: &Module,
) -> bool;
pub fn LLVMRustFreeThinLTOData(Data: *mut ThinLTOData);
pub fn LLVMRustFreeThinLTOData(Data: &'static mut ThinLTOData);
pub fn LLVMRustParseBitcodeForThinLTO(
Context: &Context,
Data: *const u8,