Avoid allocating empty map for events without payload

Summary: It's cheaper to pass nullptr over JNI, and allocate an empty folly::dynamic::object on the stack. Changelog: [Internal] Reviewed By: genkikondo Differential Revision: D43117216 fbshipit-source-id: e127cce7a1ccf50395073ca9c1c0469d0faa9f82
facebook · Feb 9, 2023 · 7535399 · 7535399
1 parent 23607ae
commit 7535399
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java
@@ -14,7 +14,6 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.fabric.FabricSoLoader;
 import com.facebook.react.uimanager.events.EventCategoryDef;
 
@@ -56,8 +55,7 @@ public synchronized void invoke(
     if (!isValid()) {
       return;
     }
-    NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
-    invokeEvent(eventName, payload, eventCategory);
+    invokeEvent(eventName, (NativeMap) params, eventCategory);
   }
 
   /**
@@ -72,8 +70,7 @@ public synchronized void invokeUnique(
     if (!isValid()) {
       return;
     }
-    NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
-    invokeUniqueEvent(eventName, payload, customCoalesceKey);
+    invokeUniqueEvent(eventName, (NativeMap) params, customCoalesceKey);
   }
 
   public synchronized void destroy() {

diff --git a/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp b/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp
@@ -28,7 +28,7 @@ void EventEmitterWrapper::invokeEvent(
   if (eventEmitter != nullptr) {
     eventEmitter->dispatchEvent(
         eventName,
-        payload->consume(),
+        payload ? payload->consume() : folly::dynamic::object(),
         EventPriority::AsynchronousBatched,
         static_cast<RawEvent::Category>(category));
   }
@@ -43,7 +43,8 @@ void EventEmitterWrapper::invokeUniqueEvent(
   // EventEmitter. In those cases, make sure we noop/blackhole events instead of
   // crashing.
   if (eventEmitter != nullptr) {
-    eventEmitter->dispatchUniqueEvent(eventName, payload->consume());
+    eventEmitter->dispatchUniqueEvent(
+        eventName, payload ? payload->consume() : folly::dynamic::object());
   }
 }