Skip to content

wip: abort when throwing std::logic_error, else continue #331

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

Draft
cole-h wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

wip: abort when throwing std::logic_error, else continue #331

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9dc50b
wip: abort when throwing std::logic_error, else continue
edolstra Feb 2, 2026
f1a800e
wip: drop print
cole-h Feb 2, 2026
4606522
lookup throw only once
cole-h Feb 3, 2026
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
14 changes: 14 additions & 0 deletions src/libmain/shared.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <algorithm>
#include <exception>
#include <iostream>
#include <dlfcn.h>

#include <cstdlib>
#include <sys/time.h>
Expand Down Expand Up @@ -408,3 +409,16 @@ PrintFreed::~PrintFreed()
}

} // namespace nix

typedef void (*cxa_throw_type)(void *, void *, void (*) (void *));

void __cxa_throw(void * exc, void * tinfo_, void (*dest)(void *))
Comment on lines +413 to +415
Copy link

@proski proski Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any chance the second argument could be declared std::type_info * instead of void *? That would make the tinfo / tinfo_ distinction unnecessary.

Copy link
Collaborator

@edolstra edolstra Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That changes the mangled name in a way that doesn't match the real __cxa_throw, so unfortunately it doesn't work.

{
auto * tinfo = (std::type_info *) tinfo_;

if (*tinfo == typeid(std::logic_error))
abort();

static auto orig_cxa_throw = (cxa_throw_type) dlsym(RTLD_NEXT, "__cxa_throw");
orig_cxa_throw(exc, tinfo_, dest);
}
Loading