Skip to content

Disable lazy selector registration check for OLDABI non-compat #420

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
HendrikHuebner wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −0
Draft

Disable lazy selector registration check for OLDABI non-compat #420

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions selector_table.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@ struct TypeList : public std::forward_list<const char*>
*/
std::vector<TypeList> *selector_list;

#ifdef __wasm__
/**
* WebAssembly's linear memory does not guarantee that static/heap alocated
* selector strings are outside a certain numeric interval.
* We can't reliably assume the pointer values are never smaller than 2^16.
* Therefore, we use an actual hash set to register selectors instead of just
* comparing the pointer value to determine whether the selector was registered.
*/
tsl::robin_set<SEL> *registered_selector_addresses;
#endif

/**
* Lock protecting the selector table.
*/
Expand All @@ -120,11 +131,17 @@ inline TypeList *selLookup(uint32_t idx)

BOOL isSelRegistered(SEL sel)
{
#ifdef __wasm__
LockGuard g{selector_table_lock};
return registered_selector_addresses->find(sel) !=
registered_selector_addresses->end();
#else
if (sel->index < selector_list->size())
{
return YES;
}
return NO;
#endif
}

/// Gets the name of a registered selector.
Expand Down Expand Up @@ -364,6 +381,9 @@ extern "C" PRIVATE void init_selector_tables()
{
selector_list = new std::vector<TypeList>(1<<16);
selector_table = new SelectorTable(1024);
#ifdef __wasm__
registered_selector_addresses = new tsl::robin_set<SEL>(1024);
#endif
selector_table_lock.init();
}

Expand All @@ -385,6 +405,9 @@ static inline void add_selector_to_table(SEL aSel)
selector_list->push_back({aSel->name});
// Set the selector's name to the uid.
aSel->index = selector_list->size() - 1;
#ifdef __wasm__
registered_selector_addresses->insert(aSel);
#endif
// Store the selector in the set.
selector_table->insert(aSel);
}
Expand Down Expand Up @@ -444,6 +467,10 @@ extern "C" PRIVATE SEL objc_register_selector(SEL aSel)
if (nullptr != registered && eq(unregistered, registered))
{
aSel->name = registered->name;
#ifdef __wasm__
LockGuard g{selector_table_lock};
registered_selector_addresses->insert(aSel);
#endif
return registered;
}
assert(!(aSel->types && (strstr(aSel->types, "@\"") != nullptr)));
Expand Down
Loading