Clean up deferRenderPhaseUpdateToNextBatch (#26511)

This is a change to some undefined behavior that we though we would do
at one point but decided not to roll out. It's already disabled
everywhere, so this just deletes the branch from the implementation and
the tests.

DiffTrain build for [2d51251](2d51251)

Author: acdlite

compiled/facebook-www/REVISION

@@ -1 +1 @@
-4c2fc01900f50b5b1081a2fb8609ea2668bc05b6
+2d51251e608b7b1a8baf79ae6bdba81ed8e1939a

compiled/facebook-www/React-dev.modern.js

@@ -27,7 +27,7 @@ if (
 }
           "use strict";
 
-var ReactVersion = "18.3.0-www-modern-da3586f6";
+var ReactVersion = "18.3.0-www-modern-8f791852";
 
 // ATTENTION
 // When adding new symbols to this file,

compiled/facebook-www/ReactART-dev.classic.js

@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var ReactVersion = "18.3.0-www-classic-7abd5856";
+var ReactVersion = "18.3.0-www-classic-4dc1bcfd";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -169,8 +169,6 @@ var revertRemovalOfSiblingPrerendering =
     dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
   replayFailedUnitOfWorkWithInvokeGuardedCallback =
     dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
-  deferRenderPhaseUpdateToNextBatch =
-    dynamicFeatureFlags.deferRenderPhaseUpdateToNextBatch,
   enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
   skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
   enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
@@ -4408,7 +4406,7 @@ function enqueueUpdate(fiber, update, lane) {
     }
   }
 
-  if (isUnsafeClassRenderPhaseUpdate(fiber)) {
+  if (isUnsafeClassRenderPhaseUpdate()) {
     // This is an unsafe render phase update. Add directly to the update
     // queue so we can process it immediately during the current render.
     var pending = sharedQueue.pending;
@@ -23509,7 +23507,6 @@ function requestUpdateLane(fiber) {
   if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
   } else if (
-    !deferRenderPhaseUpdateToNextBatch &&
     (executionContext & RenderContext) !== NoContext &&
     workInProgressRootRenderLanes !== NoLanes
   ) {
@@ -23673,14 +23670,8 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
 
     if (root === workInProgressRoot) {
       // Received an update to a tree that's in the middle of rendering. Mark
-      // that there was an interleaved update work on this root. Unless the
-      // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
-      // phase update. In that case, we don't treat render phase updates as if
-      // they were interleaved, for backwards compat reasons.
-      if (
-        deferRenderPhaseUpdateToNextBatch ||
-        (executionContext & RenderContext) === NoContext
-      ) {
+      // that there was an interleaved update work on this root.
+      if ((executionContext & RenderContext) === NoContext) {
         workInProgressRootInterleavedUpdatedLanes = mergeLanes(
           workInProgressRootInterleavedUpdatedLanes,
           lane
@@ -23719,13 +23710,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
 function isUnsafeClassRenderPhaseUpdate(fiber) {
   // Check if this is a render phase update. Only called by class components,
   // which special (deprecated) behavior for UNSAFE_componentWillReceive props.
-  return (
-    // TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
-    // decided not to enable it.
-    (!deferRenderPhaseUpdateToNextBatch ||
-      (fiber.mode & ConcurrentMode) === NoMode) &&
-    (executionContext & RenderContext) !== NoContext
-  );
+  return (executionContext & RenderContext) !== NoContext;
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the

compiled/facebook-www/ReactART-dev.modern.js

@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var ReactVersion = "18.3.0-www-modern-fdfa6ecf";
+var ReactVersion = "18.3.0-www-modern-58325a38";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -169,8 +169,6 @@ var revertRemovalOfSiblingPrerendering =
     dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
   replayFailedUnitOfWorkWithInvokeGuardedCallback =
     dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
-  deferRenderPhaseUpdateToNextBatch =
-    dynamicFeatureFlags.deferRenderPhaseUpdateToNextBatch,
   enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
   skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
   enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
@@ -4164,7 +4162,7 @@ function enqueueUpdate(fiber, update, lane) {
     }
   }
 
-  if (isUnsafeClassRenderPhaseUpdate(fiber)) {
+  if (isUnsafeClassRenderPhaseUpdate()) {
     // This is an unsafe render phase update. Add directly to the update
     // queue so we can process it immediately during the current render.
     var pending = sharedQueue.pending;
@@ -23169,7 +23167,6 @@ function requestUpdateLane(fiber) {
   if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
   } else if (
-    !deferRenderPhaseUpdateToNextBatch &&
     (executionContext & RenderContext) !== NoContext &&
     workInProgressRootRenderLanes !== NoLanes
   ) {
@@ -23333,14 +23330,8 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
 
     if (root === workInProgressRoot) {
       // Received an update to a tree that's in the middle of rendering. Mark
-      // that there was an interleaved update work on this root. Unless the
-      // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
-      // phase update. In that case, we don't treat render phase updates as if
-      // they were interleaved, for backwards compat reasons.
-      if (
-        deferRenderPhaseUpdateToNextBatch ||
-        (executionContext & RenderContext) === NoContext
-      ) {
+      // that there was an interleaved update work on this root.
+      if ((executionContext & RenderContext) === NoContext) {
         workInProgressRootInterleavedUpdatedLanes = mergeLanes(
           workInProgressRootInterleavedUpdatedLanes,
           lane
@@ -23379,13 +23370,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
 function isUnsafeClassRenderPhaseUpdate(fiber) {
   // Check if this is a render phase update. Only called by class components,
   // which special (deprecated) behavior for UNSAFE_componentWillReceive props.
-  return (
-    // TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
-    // decided not to enable it.
-    (!deferRenderPhaseUpdateToNextBatch ||
-      (fiber.mode & ConcurrentMode) === NoMode) &&
-    (executionContext & RenderContext) !== NoContext
-  );
+  return (executionContext & RenderContext) !== NoContext;
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the

compiled/facebook-www/ReactART-prod.classic.js

@@ -65,8 +65,6 @@ var ReactSharedInternals =
   dynamicFeatureFlags = require("ReactFeatureFlags"),
   revertRemovalOfSiblingPrerendering =
     dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
-  deferRenderPhaseUpdateToNextBatch =
-    dynamicFeatureFlags.deferRenderPhaseUpdateToNextBatch,
   enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
   skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
   enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
@@ -1164,22 +1162,18 @@ function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
   if (null === updateQueue) return null;
   updateQueue = updateQueue.shared;
-  if (
-    (deferRenderPhaseUpdateToNextBatch && 0 !== (fiber.mode & 1)) ||
-    0 === (executionContext & 2)
-  )
-    return (
-      enqueueUpdate$1(fiber, updateQueue, update, lane),
-      getRootForUpdatedFiber(fiber)
-    );
-  var pending = updateQueue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  updateQueue.pending = update;
-  update = getRootForUpdatedFiber(fiber);
-  markUpdateLaneFromFiberToRoot(fiber, null, lane);
-  return update;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    update = getRootForUpdatedFiber(fiber);
+    markUpdateLaneFromFiberToRoot(fiber, null, lane);
+    return update;
+  }
+  enqueueUpdate$1(fiber, updateQueue, update, lane);
+  return getRootForUpdatedFiber(fiber);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -7815,11 +7809,7 @@ function requestEventTime() {
 }
 function requestUpdateLane(fiber) {
   if (0 === (fiber.mode & 1)) return 2;
-  if (
-    !deferRenderPhaseUpdateToNextBatch &&
-    0 !== (executionContext & 2) &&
-    0 !== workInProgressRootRenderLanes
-  )
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
     return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
   if (null !== ReactCurrentBatchConfig$1.transition)
     return (
@@ -7853,12 +7843,11 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
         transitionLanesMap[index$7] = transitions;
       }
     }
-    if (root === workInProgressRoot) {
-      if (deferRenderPhaseUpdateToNextBatch || 0 === (executionContext & 2))
-        workInProgressRootInterleavedUpdatedLanes |= lane;
+    root === workInProgressRoot &&
+      (0 === (executionContext & 2) &&
+        (workInProgressRootInterleavedUpdatedLanes |= lane),
       4 === workInProgressRootExitStatus &&
-        markRootSuspended(root, workInProgressRootRenderLanes);
-    }
+        markRootSuspended(root, workInProgressRootRenderLanes));
     ensureRootIsScheduled(root, eventTime);
     2 === lane &&
       0 === executionContext &&
@@ -10034,7 +10023,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "18.3.0-www-classic-add426f7",
+    version: "18.3.0-www-classic-942a9e22",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1324 = {
@@ -10065,7 +10054,7 @@ var internals$jscomp$inline_1324 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-www-classic-add426f7"
+  reconcilerVersion: "18.3.0-www-classic-942a9e22"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1325 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled/facebook-www/ReactART-prod.modern.js

@@ -65,8 +65,6 @@ var ReactSharedInternals =
   dynamicFeatureFlags = require("ReactFeatureFlags"),
   revertRemovalOfSiblingPrerendering =
     dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
-  deferRenderPhaseUpdateToNextBatch =
-    dynamicFeatureFlags.deferRenderPhaseUpdateToNextBatch,
   enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
   skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
   enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
@@ -970,22 +968,18 @@ function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
   if (null === updateQueue) return null;
   updateQueue = updateQueue.shared;
-  if (
-    (deferRenderPhaseUpdateToNextBatch && 0 !== (fiber.mode & 1)) ||
-    0 === (executionContext & 2)
-  )
-    return (
-      enqueueUpdate$1(fiber, updateQueue, update, lane),
-      getRootForUpdatedFiber(fiber)
-    );
-  var pending = updateQueue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  updateQueue.pending = update;
-  update = getRootForUpdatedFiber(fiber);
-  markUpdateLaneFromFiberToRoot(fiber, null, lane);
-  return update;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    update = getRootForUpdatedFiber(fiber);
+    markUpdateLaneFromFiberToRoot(fiber, null, lane);
+    return update;
+  }
+  enqueueUpdate$1(fiber, updateQueue, update, lane);
+  return getRootForUpdatedFiber(fiber);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -7547,11 +7541,7 @@ function requestEventTime() {
 }
 function requestUpdateLane(fiber) {
   if (0 === (fiber.mode & 1)) return 2;
-  if (
-    !deferRenderPhaseUpdateToNextBatch &&
-    0 !== (executionContext & 2) &&
-    0 !== workInProgressRootRenderLanes
-  )
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
     return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
   if (null !== ReactCurrentBatchConfig$1.transition)
     return (
@@ -7585,12 +7575,11 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
         transitionLanesMap[index$7] = transitions;
       }
     }
-    if (root === workInProgressRoot) {
-      if (deferRenderPhaseUpdateToNextBatch || 0 === (executionContext & 2))
-        workInProgressRootInterleavedUpdatedLanes |= lane;
+    root === workInProgressRoot &&
+      (0 === (executionContext & 2) &&
+        (workInProgressRootInterleavedUpdatedLanes |= lane),
       4 === workInProgressRootExitStatus &&
-        markRootSuspended(root, workInProgressRootRenderLanes);
-    }
+        markRootSuspended(root, workInProgressRootRenderLanes));
     ensureRootIsScheduled(root, eventTime);
     2 === lane &&
       0 === executionContext &&
@@ -9699,7 +9688,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "18.3.0-www-modern-7fe55e49",
+    version: "18.3.0-www-modern-af295806",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1304 = {
@@ -9730,7 +9719,7 @@ var internals$jscomp$inline_1304 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-www-modern-7fe55e49"
+  reconcilerVersion: "18.3.0-www-modern-af295806"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1305 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled/facebook-www/ReactDOM-dev.classic.js

@@ -45,8 +45,6 @@ var disableInputAttributeSyncing =
   replayFailedUnitOfWorkWithInvokeGuardedCallback =
     dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
   enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
-  deferRenderPhaseUpdateToNextBatch =
-    dynamicFeatureFlags.deferRenderPhaseUpdateToNextBatch,
   enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
   skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
   enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
@@ -14879,7 +14877,7 @@ function enqueueUpdate(fiber, update, lane) {
     }
   }
 
-  if (isUnsafeClassRenderPhaseUpdate(fiber)) {
+  if (isUnsafeClassRenderPhaseUpdate()) {
     // This is an unsafe render phase update. Add directly to the update
     // queue so we can process it immediately during the current render.
     var pending = sharedQueue.pending;
@@ -34842,7 +34840,6 @@ function requestUpdateLane(fiber) {
   if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
   } else if (
-    !deferRenderPhaseUpdateToNextBatch &&
     (executionContext & RenderContext) !== NoContext &&
     workInProgressRootRenderLanes !== NoLanes
   ) {
@@ -35006,14 +35003,8 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
 
     if (root === workInProgressRoot) {
       // Received an update to a tree that's in the middle of rendering. Mark
-      // that there was an interleaved update work on this root. Unless the
-      // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
-      // phase update. In that case, we don't treat render phase updates as if
-      // they were interleaved, for backwards compat reasons.
-      if (
-        deferRenderPhaseUpdateToNextBatch ||
-        (executionContext & RenderContext) === NoContext
-      ) {
+      // that there was an interleaved update work on this root.
+      if ((executionContext & RenderContext) === NoContext) {
         workInProgressRootInterleavedUpdatedLanes = mergeLanes(
           workInProgressRootInterleavedUpdatedLanes,
           lane
@@ -35067,13 +35058,7 @@ function scheduleInitialHydrationOnRoot(root, lane, eventTime) {
 function isUnsafeClassRenderPhaseUpdate(fiber) {
   // Check if this is a render phase update. Only called by class components,
   // which special (deprecated) behavior for UNSAFE_componentWillReceive props.
-  return (
-    // TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
-    // decided not to enable it.
-    (!deferRenderPhaseUpdateToNextBatch ||
-      (fiber.mode & ConcurrentMode) === NoMode) &&
-    (executionContext & RenderContext) !== NoContext
-  );
+  return (executionContext & RenderContext) !== NoContext;
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the
@@ -39595,7 +39580,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-www-classic-6d884ef8";
+var ReactVersion = "18.3.0-www-classic-f0f7e718";
 
 function createPortal$1(
   children,