Skip to content

Commit f263ce8

Browse files
committed
Bugfix: Don't rely on finishedLanes for passive effects (facebook#21233)
I recently started using `pendingPassiveEffectsLanes` to check if there were any pending passive effects (530027a). `pendingPassiveEffectsLanes` is the value of `root.finishedLanes` at the beginning of the commit phase. When there are pending passive effects, it should always be a non-zero value, because it represents the lanes used to render the effects. But it turns out that `root.finishedLanes` isn't always correct. Sometimes it's `NoLanes` even when there's a new commit. I found this while investigating an internal bug report. The only repro I could get was via a headless e2e test runner; I couldn't get one in an actual browser, or other interactive environment. I used the e2e test to bisect and confirm the fix. But I don't know yet know how to write a regression test for the precise underlying scenario. I can probably reverse engineer one by studying the code; after a quick glance at `performConcurrentWorkOnRoot` and `performSyncWorkOnRoot`, it's not hard to see how this might happen. In the meantime, I'll revert the recent change that exposed the bug. I was surprised that this had never come up before, since the code that assigns `root.finishedLanes` is in an extremely hot path, and it hasn't changed in a while. The reason is that, before 530027a, `root.finishedLanes` was only used by the DevTools profiler, which is probably why we had never noticed any issues. In addition to fixing the inconsistency, we might also consider making `finishedLanes` a profiling-only field.
1 parent 3a4ca2f commit f263ce8

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,12 @@ function commitRootImpl(root, renderPriorityLevel) {
20072007

20082008
export function flushPassiveEffects(): boolean {
20092009
// Returns whether passive effects were flushed.
2010-
if (pendingPassiveEffectsLanes !== NoLanes) {
2010+
// TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
2011+
// probably just combine the two functions. I believe they were only separate
2012+
// in the first place because we used to wrap it with
2013+
// `Scheduler.runWithPriority`, which accepts a function. But now we track the
2014+
// priority within React itself, so we can mutate the variable directly.
2015+
if (rootWithPendingPassiveEffects !== null) {
20112016
const renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
20122017
const priority = lowerEventPriority(DefaultEventPriority, renderPriority);
20132018
const previousPriority = getCurrentUpdatePriority();
@@ -2042,6 +2047,9 @@ function flushPassiveEffectsImpl() {
20422047
const root = rootWithPendingPassiveEffects;
20432048
const lanes = pendingPassiveEffectsLanes;
20442049
rootWithPendingPassiveEffects = null;
2050+
// TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
2051+
// Figure out why and fix it. It's not causing any known issues (probably
2052+
// because it's only used for profiling), but it's a refactor hazard.
20452053
pendingPassiveEffectsLanes = NoLanes;
20462054

20472055
invariant(

packages/react-reconciler/src/ReactFiberWorkLoop.old.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,12 @@ function commitRootImpl(root, renderPriorityLevel) {
20072007

20082008
export function flushPassiveEffects(): boolean {
20092009
// Returns whether passive effects were flushed.
2010-
if (pendingPassiveEffectsLanes !== NoLanes) {
2010+
// TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
2011+
// probably just combine the two functions. I believe they were only separate
2012+
// in the first place because we used to wrap it with
2013+
// `Scheduler.runWithPriority`, which accepts a function. But now we track the
2014+
// priority within React itself, so we can mutate the variable directly.
2015+
if (rootWithPendingPassiveEffects !== null) {
20112016
const renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
20122017
const priority = lowerEventPriority(DefaultEventPriority, renderPriority);
20132018
const previousPriority = getCurrentUpdatePriority();
@@ -2042,6 +2047,9 @@ function flushPassiveEffectsImpl() {
20422047
const root = rootWithPendingPassiveEffects;
20432048
const lanes = pendingPassiveEffectsLanes;
20442049
rootWithPendingPassiveEffects = null;
2050+
// TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
2051+
// Figure out why and fix it. It's not causing any known issues (probably
2052+
// because it's only used for profiling), but it's a refactor hazard.
20452053
pendingPassiveEffectsLanes = NoLanes;
20462054

20472055
invariant(

0 commit comments

Comments
 (0)