Skip to content

Find a LongLivedObject in its collection without walking it #59403

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
javache merged 2 commits into from
Oct 28, 2026
Merged

Find a LongLivedObject in its collection without walking it #59403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cfbdd7
Find a LongLivedObject in its collection without walking it
hryhoriiK97 Oct 23, 2026
282efcb
Name the lookup key in LongLivedObjectCollection::remove
hryhoriiK97 Oct 23, 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: 9 additions & 5 deletions packages/react-native/ReactCommon/react/bridging/LongLivedObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@ void LongLivedObjectCollection::add(std::shared_ptr<LongLivedObject> so) {

void LongLivedObjectCollection::remove(const LongLivedObject* o) {
std::scoped_lock lock(collectionMutex_);
for (auto p = collection_.begin(); p != collection_.end(); p++) {
if (p->get() == o) {
collection_.erase(p);
break;
}
// Empty owner: lookup-only alias, with no ownership or control block.
const std::shared_ptr<LongLivedObject> lookupKey{
std::shared_ptr<LongLivedObject>{}, const_cast<LongLivedObject*>(o)};

// A shared_ptr hashes and compares by the pointer it stores, so a
// non-owning shared_ptr to `o` finds its entry without walking the set.
auto entry = collection_.find(lookupKey);
if (entry != collection_.end()) {
collection_.erase(entry);
Comment thread
javache marked this conversation as resolved.
Resolved
}
}

Expand Down
Loading