add nothrow variant of jl_get_library

mcabbott · Dec 20, 2019 · d92f2ff · d92f2ff
1 parent 608567f
commit d92f2ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -861,7 +861,8 @@ extern void *jl_crtdll_handle;
 extern void *jl_winsock_handle;
 #endif
 
-void *jl_get_library(const char *f_lib);
+void *jl_get_library_(const char *f_lib, int throw_err);
+#define jl_get_library(f_lib) jl_get_library_(f_lib, 1)
 JL_DLLEXPORT void *jl_load_and_lookup(const char *f_lib, const char *f_name,
  void **hnd);
 JL_DLLEXPORT jl_value_t *jl_get_cfunction_trampoline(

diff --git a/src/runtime_ccall.cpp b/src/runtime_ccall.cpp
@@ -27,7 +27,7 @@ using namespace llvm;
 static std::map<std::string, void*> libMap;
 static jl_mutex_t libmap_lock;
 extern "C"
-void *jl_get_library(const char *f_lib)
+void *jl_get_library_(const char *f_lib, int throw_err)
 {
  void *hnd;
 #ifdef _OS_WINDOWS_
@@ -47,7 +47,7 @@ void *jl_get_library(const char *f_lib)
  if (hnd != NULL)
  return hnd;
  // We might run this concurrently on two threads but it doesn't matter.
- hnd = jl_load_dynamic_library(f_lib, JL_RTLD_DEFAULT, 1);
+ hnd = jl_load_dynamic_library(f_lib, JL_RTLD_DEFAULT, throw_err);
  if (hnd != NULL)
  jl_atomic_store_release(map_slot, hnd);
  return hnd;