Skip to content

llvm::mk_object_file to option type (fixes OS X crash) #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

llvm::mk_object_file to option type (fixes OS X crash) #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/comp/lib/llvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import std::{vec, str};
import std::{vec, str, option};
import std::str::sbuf;

import llvm::{ModuleRef, ContextRef, TypeRef, TypeHandleRef, ValueRef,
Expand Down Expand Up @@ -1057,9 +1057,10 @@ resource object_file_res(ObjectFile: ObjectFileRef) {

type object_file = {llof: ObjectFileRef, dtor: @object_file_res};

fn mk_object_file(llmb: MemoryBufferRef) -> object_file {
fn mk_object_file(llmb: MemoryBufferRef) -> option::t<object_file> {
let llof = llvm::LLVMCreateObjectFile(llmb);
ret {llof: llof, dtor: @object_file_res(llof)};
if llof as int == 0 { ret option::none::<object_file>; }
ret option::some::<object_file>({llof: llof, dtor: @object_file_res(llof)});
}

/* Memory-managed interface to section iterators. */
Expand Down
5 changes: 4 additions & 1 deletion src/comp/metadata/creader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ fn get_metadata_section(sess: session::session,
llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(buf)
});
if mb as int == 0 { ret option::none::<@[u8]>; }
let of = mk_object_file(mb);
let of = alt mk_object_file(mb) {
option::some(of) { of }
_ { ret option::none::<@[u8]>; }
};
let si = mk_section_iter(of.llof);
while llvm::LLVMIsSectionIteratorAtEnd(of.llof, si.llsi) == False {
let name_buf = llvm::LLVMGetSectionName(si.llsi);
Expand Down