Skip to content

Fix Base.libllvm_path and jl_get_libllvm don't support non-ASCII characters in path on Windows (#45126) #45127

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

Merged
merged 4 commits into from
Feb 14, 2023
Merged

Fix Base.libllvm_path and jl_get_libllvm don't support non-ASCII characters in path on Windows (#45126) #45127

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
215a0be
Fix jl_get_libllvm_impl to support non-ASCII characters
wesjenkins Apr 30, 2022
d059e09
Fix jl_get_libllvm_impl to support non-ASCII characters, fix whitespace
wesjenkins Apr 30, 2022
ac790eb
Fix jl_get_libllvm_impl to support non-ASCII characters, fix null and…
wesjenkins Apr 30, 2022
258b200
Merge branch 'master' into fix_libllvm
DilumAluthge Feb 12, 2023
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
12 changes: 8 additions & 4 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8960,11 +8960,15 @@ extern "C" JL_DLLEXPORT jl_value_t *jl_get_libllvm_impl(void) JL_NOTSAFEPOINT
HMODULE mod;
if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)&llvm::DebugFlag, &mod))
return jl_nothing;

char path[MAX_PATH];
if (!GetModuleFileNameA(mod, path, sizeof(path)))
wchar_t path16[MAX_PATH];
DWORD n16 = GetModuleFileNameW(mod, path16, MAX_PATH);
if (n16 <= 0)
return jl_nothing;
path16[n16++] = 0;
char path8[MAX_PATH * 3];
if (!WideCharToMultiByte(CP_UTF8, 0, path16, n16, path8, MAX_PATH * 3, NULL, NULL))
return jl_nothing;
return (jl_value_t*) jl_symbol(path);
return (jl_value_t*) jl_symbol(path8);
#else
Dl_info dli;
if (!dladdr((void*)LLVMContextCreate, &dli))
Expand Down