Skip to content

Commit fea9a7d

Browse files
acdliteacdlite
committed
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 commit 2d51251.
1 parent f115265 commit fea9a7d

File tree

13 files changed

+25
-46
lines changed

13 files changed

+25
-46
lines changed

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -19780,10 +19780,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
1978019780

1978119781
if (root === workInProgressRoot) {
1978219782
// Received an update to a tree that's in the middle of rendering. Mark
19783-
// that there was an interleaved update work on this root. Unless the
19784-
// `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
19785-
// phase update. In that case, we don't treat render phase updates as if
19786-
// they were interleaved, for backwards compat reasons.
19783+
// that there was an interleaved update work on this root.
1978719784
if ((executionContext & RenderContext) === NoContext) {
1978819785
workInProgressRootInterleavedUpdatedLanes = mergeLanes(
1978919786
workInProgressRootInterleavedUpdatedLanes,
@@ -19823,11 +19820,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
1982319820
function isUnsafeClassRenderPhaseUpdate(fiber) {
1982419821
// Check if this is a render phase update. Only called by class components,
1982519822
// which special (deprecated) behavior for UNSAFE_componentWillReceive props.
19826-
return (
19827-
// TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
19828-
// decided not to enable it.
19829-
(executionContext & RenderContext) !== NoContext
19830-
);
19823+
return (executionContext & RenderContext) !== NoContext;
1983119824
} // Use this function to schedule a task for a root. There's only one task per
1983219825
// root; if a task was already scheduled, we'll check to make sure the priority
1983319826
// of the existing task is the same as the priority of the next level that the
@@ -23762,7 +23755,7 @@ function createFiberRoot(
2376223755
return root;
2376323756
}
2376423757

23765-
var ReactVersion = "18.3.0-next-0ffc7f632-20230330";
23758+
var ReactVersion = "18.3.0-next-2d51251e6-20230330";
2376623759

2376723760
// Might add PROFILE later.
2376823761

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8640,7 +8640,7 @@ var devToolsConfig$jscomp$inline_1007 = {
86408640
throw Error("TestRenderer does not support findFiberByHostInstance()");
86418641
},
86428642
bundleType: 0,
8643-
version: "18.3.0-next-0ffc7f632-20230330",
8643+
version: "18.3.0-next-2d51251e6-20230330",
86448644
rendererPackageName: "react-test-renderer"
86458645
};
86468646
var internals$jscomp$inline_1198 = {
@@ -8671,7 +8671,7 @@ var internals$jscomp$inline_1198 = {
86718671
scheduleRoot: null,
86728672
setRefreshHandler: null,
86738673
getCurrentFiber: null,
8674-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
8674+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
86758675
};
86768676
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
86778677
var hook$jscomp$inline_1199 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9065,7 +9065,7 @@ var devToolsConfig$jscomp$inline_1050 = {
90659065
throw Error("TestRenderer does not support findFiberByHostInstance()");
90669066
},
90679067
bundleType: 0,
9068-
version: "18.3.0-next-0ffc7f632-20230330",
9068+
version: "18.3.0-next-2d51251e6-20230330",
90699069
rendererPackageName: "react-test-renderer"
90709070
};
90719071
var internals$jscomp$inline_1239 = {
@@ -9096,7 +9096,7 @@ var internals$jscomp$inline_1239 = {
90969096
scheduleRoot: null,
90979097
setRefreshHandler: null,
90989098
getCurrentFiber: null,
9099-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
9099+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
91009100
};
91019101
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
91029102
var hook$jscomp$inline_1240 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (
2727
}
2828
"use strict";
2929

30-
var ReactVersion = "18.3.0-next-0ffc7f632-20230330";
30+
var ReactVersion = "18.3.0-next-2d51251e6-20230330";
3131

3232
// ATTENTION
3333
// When adding new symbols to this file,

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,4 +639,4 @@ exports.useSyncExternalStore = function (
639639
);
640640
};
641641
exports.useTransition = useTransition;
642-
exports.version = "18.3.0-next-0ffc7f632-20230330";
642+
exports.version = "18.3.0-next-2d51251e6-20230330";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ exports.useSyncExternalStore = function (
642642
);
643643
};
644644
exports.useTransition = useTransition;
645-
exports.version = "18.3.0-next-0ffc7f632-20230330";
645+
exports.version = "18.3.0-next-2d51251e6-20230330";
646646

647647
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
648648
if (

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0ffc7f632b5cdc2d4ede97b6f8ff55e02183bdf9
1+
2d51251e608b7b1a8baf79ae6bdba81ed8e1939a

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -22844,10 +22844,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
2284422844

2284522845
if (root === workInProgressRoot) {
2284622846
// Received an update to a tree that's in the middle of rendering. Mark
22847-
// that there was an interleaved update work on this root. Unless the
22848-
// `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
22849-
// phase update. In that case, we don't treat render phase updates as if
22850-
// they were interleaved, for backwards compat reasons.
22847+
// that there was an interleaved update work on this root.
2285122848
if ((executionContext & RenderContext) === NoContext) {
2285222849
workInProgressRootInterleavedUpdatedLanes = mergeLanes(
2285322850
workInProgressRootInterleavedUpdatedLanes,
@@ -22887,11 +22884,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
2288722884
function isUnsafeClassRenderPhaseUpdate(fiber) {
2288822885
// Check if this is a render phase update. Only called by class components,
2288922886
// which special (deprecated) behavior for UNSAFE_componentWillReceive props.
22890-
return (
22891-
// TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
22892-
// decided not to enable it.
22893-
(executionContext & RenderContext) !== NoContext
22894-
);
22887+
return (executionContext & RenderContext) !== NoContext;
2289522888
} // Use this function to schedule a task for a root. There's only one task per
2289622889
// root; if a task was already scheduled, we'll check to make sure the priority
2289722890
// of the existing task is the same as the priority of the next level that the
@@ -27028,7 +27021,7 @@ function createFiberRoot(
2702827021
return root;
2702927022
}
2703027023

27031-
var ReactVersion = "18.3.0-next-0ffc7f632-20230330";
27024+
var ReactVersion = "18.3.0-next-2d51251e6-20230330";
2703227025

2703327026
function createPortal$1(
2703427027
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9507,7 +9507,7 @@ var roots = new Map(),
95079507
devToolsConfig$jscomp$inline_1027 = {
95089508
findFiberByHostInstance: getInstanceFromNode,
95099509
bundleType: 0,
9510-
version: "18.3.0-next-0ffc7f632-20230330",
9510+
version: "18.3.0-next-2d51251e6-20230330",
95119511
rendererPackageName: "react-native-renderer",
95129512
rendererConfig: {
95139513
getInspectorDataForViewTag: function () {
@@ -9549,7 +9549,7 @@ var internals$jscomp$inline_1273 = {
95499549
scheduleRoot: null,
95509550
setRefreshHandler: null,
95519551
getCurrentFiber: null,
9552-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
9552+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
95539553
};
95549554
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
95559555
var hook$jscomp$inline_1274 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10215,7 +10215,7 @@ var roots = new Map(),
1021510215
devToolsConfig$jscomp$inline_1106 = {
1021610216
findFiberByHostInstance: getInstanceFromNode,
1021710217
bundleType: 0,
10218-
version: "18.3.0-next-0ffc7f632-20230330",
10218+
version: "18.3.0-next-2d51251e6-20230330",
1021910219
rendererPackageName: "react-native-renderer",
1022010220
rendererConfig: {
1022110221
getInspectorDataForViewTag: function () {
@@ -10270,7 +10270,7 @@ var roots = new Map(),
1027010270
scheduleRoot: null,
1027110271
setRefreshHandler: null,
1027210272
getCurrentFiber: null,
10273-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
10273+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
1027410274
});
1027510275
exports.createPortal = function (children, containerTag) {
1027610276
return createPortal$1(

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -23384,10 +23384,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
2338423384

2338523385
if (root === workInProgressRoot) {
2338623386
// Received an update to a tree that's in the middle of rendering. Mark
23387-
// that there was an interleaved update work on this root. Unless the
23388-
// `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
23389-
// phase update. In that case, we don't treat render phase updates as if
23390-
// they were interleaved, for backwards compat reasons.
23387+
// that there was an interleaved update work on this root.
2339123388
if ((executionContext & RenderContext) === NoContext) {
2339223389
workInProgressRootInterleavedUpdatedLanes = mergeLanes(
2339323390
workInProgressRootInterleavedUpdatedLanes,
@@ -23427,11 +23424,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
2342723424
function isUnsafeClassRenderPhaseUpdate(fiber) {
2342823425
// Check if this is a render phase update. Only called by class components,
2342923426
// which special (deprecated) behavior for UNSAFE_componentWillReceive props.
23430-
return (
23431-
// TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
23432-
// decided not to enable it.
23433-
(executionContext & RenderContext) !== NoContext
23434-
);
23427+
return (executionContext & RenderContext) !== NoContext;
2343523428
} // Use this function to schedule a task for a root. There's only one task per
2343623429
// root; if a task was already scheduled, we'll check to make sure the priority
2343723430
// of the existing task is the same as the priority of the next level that the
@@ -27568,7 +27561,7 @@ function createFiberRoot(
2756827561
return root;
2756927562
}
2757027563

27571-
var ReactVersion = "18.3.0-next-0ffc7f632-20230330";
27564+
var ReactVersion = "18.3.0-next-2d51251e6-20230330";
2757227565

2757327566
function createPortal$1(
2757427567
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9763,7 +9763,7 @@ var roots = new Map(),
97639763
devToolsConfig$jscomp$inline_1086 = {
97649764
findFiberByHostInstance: getInstanceFromTag,
97659765
bundleType: 0,
9766-
version: "18.3.0-next-0ffc7f632-20230330",
9766+
version: "18.3.0-next-2d51251e6-20230330",
97679767
rendererPackageName: "react-native-renderer",
97689768
rendererConfig: {
97699769
getInspectorDataForViewTag: function () {
@@ -9805,7 +9805,7 @@ var internals$jscomp$inline_1339 = {
98059805
scheduleRoot: null,
98069806
setRefreshHandler: null,
98079807
getCurrentFiber: null,
9808-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
9808+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
98099809
};
98109810
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
98119811
var hook$jscomp$inline_1340 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10471,7 +10471,7 @@ var roots = new Map(),
1047110471
devToolsConfig$jscomp$inline_1165 = {
1047210472
findFiberByHostInstance: getInstanceFromTag,
1047310473
bundleType: 0,
10474-
version: "18.3.0-next-0ffc7f632-20230330",
10474+
version: "18.3.0-next-2d51251e6-20230330",
1047510475
rendererPackageName: "react-native-renderer",
1047610476
rendererConfig: {
1047710477
getInspectorDataForViewTag: function () {
@@ -10526,7 +10526,7 @@ var roots = new Map(),
1052610526
scheduleRoot: null,
1052710527
setRefreshHandler: null,
1052810528
getCurrentFiber: null,
10529-
reconcilerVersion: "18.3.0-next-0ffc7f632-20230330"
10529+
reconcilerVersion: "18.3.0-next-2d51251e6-20230330"
1053010530
});
1053110531
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
1053210532
computeComponentStackForErrorReporting: function (reactTag) {

0 commit comments

Comments
 (0)