fix use out-of-scope memory warning (facebook#41441)

Summary: Pull Request resolved: facebook#41441 changelog: [internal] Reviewed By: cipolleschi Differential Revision: D51233760 fbshipit-source-id: 5fc7ab22220e3d80729243e715e22e85e3ba7afa
Saadnajmi · May 21, 2024 · 88d042b · 88d042b
1 parent 0204338
commit 88d042b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -156,10 +156,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   ShadowNodeFamily::Shared createFamily(
       const ShadowNodeFamilyFragment& fragment) const override {
     return std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            fragment.tag, fragment.surfaceId, fragment.instanceHandle},
-        eventDispatcher_,
-        *this);
+        fragment, eventDispatcher_, *this);
   }
 
   SharedEventEmitter createEventEmitter(

diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h
@@ -28,14 +28,11 @@ class State;
  * about a `ShadowNodeFamily`. Pelase define specific purpose containers in
  * those cases.
  *
- * Note: All of the fields are `const &` references (essentially just raw
- * pointers) which means that the Fragment does not copy/store them nor
- * retain ownership of them.
  */
 struct ShadowNodeFamilyFragment {
   const Tag tag;
   const SurfaceId surfaceId;
-  const InstanceHandle::Shared& instanceHandle;
+  const std::shared_ptr<const InstanceHandle> instanceHandle;
 };
 
 /*

diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -291,8 +291,8 @@ ShadowTree::ShadowTree(
       layoutConstraints,
       layoutContext);
 
-  const auto fragment = ShadowNodeFamilyFragment{surfaceId, surfaceId, nullptr};
-  auto family = globalRootComponentDescriptor->createFamily(fragment);
+  auto family = globalRootComponentDescriptor->createFamily(
+      {surfaceId, surfaceId, nullptr});
 
   auto rootShadowNode = std::static_pointer_cast<const RootShadowNode>(
       globalRootComponentDescriptor->createShadowNode(

diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -77,9 +77,8 @@ ShadowNode::Shared UIManager::createNode(
 
   PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()};
 
-  const auto fragment =
-      ShadowNodeFamilyFragment{tag, surfaceId, instanceHandle};
-  auto family = componentDescriptor.createFamily(fragment);
+  auto family =
+      componentDescriptor.createFamily({tag, surfaceId, instanceHandle});
   const auto props =
       componentDescriptor.cloneProps(propsParserContext, nullptr, rawProps);
   const auto state = componentDescriptor.createInitialState(props, family);