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

rustc_codegen_llvm: use safe references for ArchiveIterator.

This commit is contained in:
Irina Popa 2018-07-17 14:31:06 +03:00
parent 894467e5b4
commit e551ed9033
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_codegen_llvm/llvm/archive_ro.rs
View File

@ -23,8 +23,7 @@ pub struct ArchiveRO {
unsafe impl Send for ArchiveRO {}
pub struct Iter<'a> {
ptr: super::ArchiveIteratorRef,
_data: marker::PhantomData<&'a ArchiveRO>,
ptr: &'a mut super::ArchiveIterator<'a>,
}
pub struct Child<'a> {
@ -68,7 +67,6 @@ impl ArchiveRO {
unsafe {
Iter {
ptr: super::LLVMRustArchiveIteratorNew(self.raw),
_data: marker::PhantomData,
}
}
}
@ -101,7 +99,7 @@ impl<'a> Iterator for Iter<'a> {
impl<'a> Drop for Iter<'a> {
fn drop(&mut self) {
unsafe {
super::LLVMRustArchiveIteratorFree(self.ptr);
super::LLVMRustArchiveIteratorFree(&mut *(self.ptr as *mut _));
}
}
}

9
src/librustc_codegen_llvm/llvm/ffi.rs
View File

@ -404,8 +404,7 @@ pub struct SectionIterator<'a>(InvariantOpaque<'a>);
extern { pub type Pass; }
extern { pub type TargetMachine; }
extern { pub type Archive; }
extern { pub type ArchiveIterator; }
pub type ArchiveIteratorRef = *mut ArchiveIterator;
pub struct ArchiveIterator<'a>(InvariantOpaque<'a>);
extern { pub type ArchiveChild; }
pub type ArchiveChildRef = *mut ArchiveChild;
extern { pub type Twine; }
@ -1471,12 +1470,12 @@ extern "C" {
pub fn LLVMRustMarkAllFunctionsNounwind(M: &Module);
pub fn LLVMRustOpenArchive(path: *const c_char) -> Option<&'static mut Archive>;
pub fn LLVMRustArchiveIteratorNew(AR: &Archive) -> ArchiveIteratorRef;
pub fn LLVMRustArchiveIteratorNext(AIR: ArchiveIteratorRef) -> ArchiveChildRef;
pub fn LLVMRustArchiveIteratorNew(AR: &'a Archive) -> &'a mut ArchiveIterator<'a>;
pub fn LLVMRustArchiveIteratorNext(AIR: &ArchiveIterator) -> ArchiveChildRef;
pub fn LLVMRustArchiveChildName(ACR: ArchiveChildRef, size: &mut size_t) -> *const c_char;
pub fn LLVMRustArchiveChildData(ACR: ArchiveChildRef, size: &mut size_t) -> *const c_char;
pub fn LLVMRustArchiveChildFree(ACR: ArchiveChildRef);
pub fn LLVMRustArchiveIteratorFree(AIR: ArchiveIteratorRef);
pub fn LLVMRustArchiveIteratorFree(AIR: &'a mut ArchiveIterator<'a>);
pub fn LLVMRustDestroyArchive(AR: &'static mut Archive);
pub fn LLVMRustGetSectionName(SI: &SectionIterator, data: &mut *const c_char) -> size_t;