From 08993efe3d74d2065b226f6c05d3ebda0dc72474 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 26 Oct 2026 07:47:18 -0700 Subject: [PATCH] Require constant initialization for Yoga globals Summary: Require constant initialization for the layout generation counter and event subscriber list. Changelog: [Internal] ___ landed-with-radar-review Differential Revision: D127576224 --- .../ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp | 2 +- packages/react-native/ReactCommon/yoga/yoga/event/event.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp index 7b1d7461d745..192a6af77da9 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp @@ -35,7 +35,7 @@ namespace facebook::yoga { -std::atomic gCurrentGenerationCount(0); +constinit std::atomic gCurrentGenerationCount(0); static bool hasAutoHorizontalMargin(const Style& style) { for (const auto direction : {Direction::LTR, Direction::RTL}) { diff --git a/packages/react-native/ReactCommon/yoga/yoga/event/event.cpp b/packages/react-native/ReactCommon/yoga/yoga/event/event.cpp index ac6735d6d44b..b9d373775946 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/event/event.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/event/event.cpp @@ -46,7 +46,7 @@ struct Node { : subscriber{std::move(subscriber)} {} }; -std::atomic subscribers{nullptr}; +constinit std::atomic subscribers{nullptr}; Node* push(Node* newHead) { Node* oldHead = nullptr;