Skip to content

[Orc] Fix error handling in ORCPlatformSupport::initialize #144637

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 5 commits into from
Jul 7, 2025
Merged

[Orc] Fix error handling in ORCPlatformSupport::initialize #144637

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df066d5
[Orc] Fix error handling in `ORCPlatformSupport::initialize`
SahilPatidar Jun 18, 2025
6e2fd1b
Merge branch 'main' into orc_err
anutosh491 Jun 30, 2025
8b5c89a
Merge branch 'main' into orc_err
anutosh491 Jul 1, 2025
9fa7469
Merge branch 'main' into orc_err
anutosh491 Jul 3, 2025
c384400
Merge branch 'main' into orc_err
anutosh491 Jul 7, 2025
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
15 changes: 9 additions & 6 deletions llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,16 +632,19 @@ Error ORCPlatformSupport::initialize(orc::JITDylib &JD) {
int32_t result;
auto E = ES.callSPSWrapper<SPSDLUpdateSig>(WrapperAddr->getAddress(),
result, DSOHandles[&JD]);
if (result)
if (E)
return E;
else if (result)
return make_error<StringError>("dlupdate failed",
inconvertibleErrorCode());
return E;
}
return ES.callSPSWrapper<SPSDLOpenSig>(WrapperAddr->getAddress(),
DSOHandles[&JD], JD.getName(),
int32_t(ORC_RT_RTLD_LAZY));
} else
return ES.callSPSWrapper<SPSDLOpenSig>(WrapperAddr->getAddress(),
DSOHandles[&JD], JD.getName(),
int32_t(ORC_RT_RTLD_LAZY));
} else
return WrapperAddr.takeError();

return Error::success();
}

Error ORCPlatformSupport::deinitialize(orc::JITDylib &JD) {
Expand Down
Loading