Skip to content

Commit

Permalink
Fix syntax error introduced by f027462
Browse files Browse the repository at this point in the history
  • Loading branch information
@staticfloat
staticfloat committed Nov 30, 2014
1 parent fdf91ab commit 937ca4d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/debuginfo.cpp
View file
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);

This comment has been minimized.

Sign in to view

Copy link
@timholy

timholy Dec 3, 2014

Member

@staticfloat, I'm now getting this:

...
    CC src/debuginfo.o
debuginfo.cpp: In function ‘void jl_getDylibFunctionInfo(const char**, size_t*, const char**, size_t, int*, int)’:
debuginfo.cpp:408:16: warning: unused variable ‘msize’ [-Wunused-variable]
         size_t msize = (size_t)(((uint64_t)-1)-fbase);
                ^
    CC src/interpreter.o
...

This comment has been minimized.

Sign in to view

Copy link
@timholy

timholy Dec 3, 2014

Member

Oh wait, it looks like this was just formatting changes. Not sure where this came from initially.
*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

0 comments on commit 937ca4d

Please sign in to comment.