Skip to content
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

Jump to bottom

Delete some dead code containing bugs. #205

Merged
merged 1 commit into from Apr 29, 2021
Merged

Delete some dead code containing bugs. #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 0 additions & 30 deletions objcxx_eh.cc
View file
Open in desktop
Expand Up @@ -126,10 +126,6 @@ std::atomic<bool> done_setup;
* header in a `__cxa_exception`.
*/
std::atomic<ptrdiff_t> type_info_offset;
/**
* The offset of the reference count in a
*/
std::atomic<ptrdiff_t> refcount_offset;
/**
* The size of the `_Unwind_Exception` (including padding) in a
* `__cxa_exception`.
Expand Down Expand Up @@ -461,32 +457,6 @@ BEGIN_PERSONALITY_FUNCTION(test_eh_personality)
{
uint64_t cls = __builtin_bswap64(exceptionClass);
type_info_offset = find_backwards(exceptionObject, &typeid(MagicValueHolder));
#ifdef __LP64__
// On 64-bit platforms, the refcount is added to the front of the
// structure.
ptrdiff_t refcount_backwards_offset = type_info_offset - sizeof(uintptr_t);
#else
// On 32-bit platforms, this should be immediately before the
// _Unwind_Exception in some spare padding, but libsupc++ puts it in
// the same place as for 64-bit. Try the one that's definitely in the
// object first and then fall back to the other...
ptrdiff_t refcount_backwards_offset = -sizeof(uint32_t);
auto read_offset = [](void *obj, ptrdiff_t offset)
{
char *addr = reinterpret_cast<char*>(obj) + offset;
uintptr_t v = *reinterpret_cast<uintptr_t*>(addr);
return v;
};
if (read_offset(exceptionObject, refcount_backwards_offset) != 1)
{
refcount_backwards_offset = type_info_offset - sizeof(uintptr_t);
}
if (read_offset(exceptionObject, refcount_backwards_offset) != 1)
{
fprintf(stderr, "Unable to find refcount field\n");
abort();
}
#endif
exception_struct_size = find_forwards(exceptionObject, MagicValueHolder::magic);
cxx_exception_class = exceptionClass;
done_setup = true;
Expand Down