Skip to content

Commit

Permalink
Try fixing LLVM 3.3 compilation (#18138)
Browse files Browse the repository at this point in the history
(cherry picked from commit 065a208)
  • Loading branch information
yuyichao authored and tkelman committed Aug 20, 2016
1 parent 1fb052e commit 3239e25
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/debuginfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -893,14 +893,6 @@ calc_gnu_debuglink_crc32(const void *buf, size_t size)
return crc ^ ~0U;
}

template<typename T>
static inline void ignoreError(T &err)
{
#if defined(LLVM39) && !defined(NDEBUG)
consumeError(err.takeError());
#endif
}

#ifdef LLVM39
static Expected<object::OwningBinary<object::ObjectFile>>
#else
Expand Down Expand Up @@ -958,6 +950,14 @@ extern "C" void jl_register_fptrs(uint64_t sysimage_base, void **fptrs, jl_lambd
sysimg_fvars_n = n;
}

template<typename T>
static inline void ignoreError(T &err)
{
#if defined(LLVM39) && !defined(NDEBUG)
consumeError(err.takeError());
#endif
}

extern "C" void jl_refresh_dbg_module_list(void);
bool jl_dylib_DI_for_fptr(size_t pointer, const llvm::object::ObjectFile **obj, llvm::DIContext **context, int64_t *slide, int64_t *section_slide,
bool onlySysImg, bool *isSysImg, void **saddr, char **name, char **filename)
Expand Down

0 comments on commit 3239e25

Please sign in to comment.