Skip to content

Commit

Permalink
Merge pull request #9201 from JuliaLang/sf/syntaxfix
Browse files Browse the repository at this point in the history
Fix syntax error introduced by f027462
  • Loading branch information
staticfloat committed Nov 30, 2014
2 parents fdf91ab + 746f981 commit 84612d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/debuginfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ void jl_getDylibFunctionInfo(const char **name, size_t *line, const char **filen
if ((dladdr((void*)pointer, &dlinfo) != 0) && dlinfo.dli_fname) {
const char *fname;
uint64_t fbase = (uint64_t)dlinfo.dli_fbase;
size_t msize = (size_t)(((uint64_t)-1)-fbase));
size_t msize = (size_t)(((uint64_t)-1)-fbase);
*fromC = (fbase != jl_sysimage_base);
if (skipC && *fromC)
return;
Expand All @@ -432,13 +432,13 @@ void jl_getDylibFunctionInfo(const char **name, size_t *line, const char **filen
membuf->getMemBufferRef(), sys::fs::file_magic::unknown);
#elif defined(LLVM35)
MemoryBuffer *membuf = MemoryBuffer::getMemBuffer(
StringRef((const char *)fbase, msize), "", false);
StringRef((const char *)fbase, msize)), "", false);
std::unique_ptr<MemoryBuffer> buf(membuf);
auto origerrorobj = llvm::object::ObjectFile::createObjectFile(
buf, sys::fs::file_magic::unknown);
#else
MemoryBuffer *membuf = MemoryBuffer::getMemBuffer(
StringRef((const char *)fbase, msize, "", false);
StringRef((const char *)fbase, msize), "", false);
llvm::object::ObjectFile *origerrorobj = llvm::object::ObjectFile::createObjectFile(
membuf);
#endif
Expand Down Expand Up @@ -633,7 +633,7 @@ void jl_getFunctionInfo(const char **name, size_t *line, const char **filename,
#endif // USE_MCJIT
}

int jl_get_llvmf_info(size_t fptr, uint64_t *symsize,
int jl_get_llvmf_info(size_t fptr, uint64_t *symsize,
#ifdef USE_MCJIT
object::ObjectFile **object)
#else
Expand All @@ -645,7 +645,7 @@ int jl_get_llvmf_info(size_t fptr, uint64_t *symsize,
std::map<size_t, FuncInfo, revcomp>::iterator fit = fmap.find(fptr);

if (fit == fmap.end()) {
return 0;
return 0;
}
*symsize = fit->second.lengthAdr;
*lines = fit->second.lines;
Expand Down
2 changes: 1 addition & 1 deletion src/disasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#include <llvm/LLVMContext.h>
#endif
#include <llvm/DebugInfo/DIContext.h>
#ifdef LLVM35
#ifdef LLVM35
#include <llvm/IR/DebugInfo.h>
#elif defined(LLVM32)
#include <llvm/DebugInfo.h>
Expand Down

0 comments on commit 84612d4

Please sign in to comment.