Fix fiber memory leak with runAllPassiveEffectDestroysBeforeCreates (facebook#18554)

trueadm · web-flow · commit 0566b706eefc · 2020-04-09T15:35:07.000+01:00
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -2368,12 +2368,15 @@ function flushPassiveEffectsImpl() {
         }
       }
     }
-  } else {
-    // Note: This currently assumes there are no passive effects on the root fiber
-    // because the root is not part of its own effect list.
-    // This could change in the future.
-    let effect = root.current.firstEffect;
-    while (effect !== null) {
+  }
+  // Note: This currently assumes there are no passive effects on the root fiber
+  // because the root is not part of its own effect list.
+  // This could change in the future.
+  let effect = root.current.firstEffect;
+  while (effect !== null) {
+    // We do this work above if this flag is enabled, so we shouldn't be
+    // doing it here.
+    if (!runAllPassiveEffectDestroysBeforeCreates) {
       if (__DEV__) {
         setCurrentDebugFiberInDEV(effect);
         invokeGuardedCallback(null, commitPassiveHookEffects, null, effect);
@@ -2391,12 +2394,12 @@ function flushPassiveEffectsImpl() {
           captureCommitPhaseError(effect, error);
         }
       }
-
-      const nextNextEffect = effect.nextEffect;
-      // Remove nextEffect pointer to assist GC
-      effect.nextEffect = null;
-      effect = nextNextEffect;
     }
+
+    const nextNextEffect = effect.nextEffect;
+    // Remove nextEffect pointer to assist GC
+    effect.nextEffect = null;
+    effect = nextNextEffect;
   }
 
   if (enableProfilerTimer && enableProfilerCommitHooks) {
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js
@@ -2368,12 +2368,15 @@ function flushPassiveEffectsImpl() {
         }
       }
     }
-  } else {
-    // Note: This currently assumes there are no passive effects on the root fiber
-    // because the root is not part of its own effect list.
-    // This could change in the future.
-    let effect = root.current.firstEffect;
-    while (effect !== null) {
+  }
+  // Note: This currently assumes there are no passive effects on the root fiber
+  // because the root is not part of its own effect list.
+  // This could change in the future.
+  let effect = root.current.firstEffect;
+  while (effect !== null) {
+    // We do this work above if this flag is enabled, so we shouldn't be
+    // doing it here.
+    if (!runAllPassiveEffectDestroysBeforeCreates) {
       if (__DEV__) {
         setCurrentDebugFiberInDEV(effect);
         invokeGuardedCallback(null, commitPassiveHookEffects, null, effect);
@@ -2391,12 +2394,12 @@ function flushPassiveEffectsImpl() {
           captureCommitPhaseError(effect, error);
         }
       }
-
-      const nextNextEffect = effect.nextEffect;
-      // Remove nextEffect pointer to assist GC
-      effect.nextEffect = null;
-      effect = nextNextEffect;
     }
+
+    const nextNextEffect = effect.nextEffect;
+    // Remove nextEffect pointer to assist GC
+    effect.nextEffect = null;
+    effect = nextNextEffect;
   }
 
   if (enableProfilerTimer && enableProfilerCommitHooks) {

Original file line number	Diff line number	Diff line change
`@@ -2368,12 +2368,15 @@ function flushPassiveEffectsImpl() {`
`2368`	`2368`	`}`
`2369`	`2369`	`}`
`2370`	`2370`	`}`
`2371`		`- } else {`
`2372`		`- // Note: This currently assumes there are no passive effects on the root fiber`
`2373`		`- // because the root is not part of its own effect list.`
`2374`		`- // This could change in the future.`
`2375`		`- let effect = root.current.firstEffect;`
`2376`		`- while (effect !== null) {`
	`2371`	`+ }`
	`2372`	`+ // Note: This currently assumes there are no passive effects on the root fiber`
	`2373`	`+ // because the root is not part of its own effect list.`
	`2374`	`+ // This could change in the future.`
	`2375`	`+ let effect = root.current.firstEffect;`
	`2376`	`+ while (effect !== null) {`
	`2377`	`+ // We do this work above if this flag is enabled, so we shouldn't be`
	`2378`	`+ // doing it here.`
	`2379`	`+ if (!runAllPassiveEffectDestroysBeforeCreates) {`
`2377`	`2380`	`if (__DEV__) {`
`2378`	`2381`	`setCurrentDebugFiberInDEV(effect);`
`2379`	`2382`	`invokeGuardedCallback(null, commitPassiveHookEffects, null, effect);`
`@@ -2391,12 +2394,12 @@ function flushPassiveEffectsImpl() {`
`2391`	`2394`	`captureCommitPhaseError(effect, error);`
`2392`	`2395`	`}`
`2393`	`2396`	`}`
`2394`		`-`
`2395`		`- const nextNextEffect = effect.nextEffect;`
`2396`		`- // Remove nextEffect pointer to assist GC`
`2397`		`- effect.nextEffect = null;`
`2398`		`- effect = nextNextEffect;`
`2399`	`2397`	`}`
	`2398`	`+`
	`2399`	`+ const nextNextEffect = effect.nextEffect;`
	`2400`	`+ // Remove nextEffect pointer to assist GC`
	`2401`	`+ effect.nextEffect = null;`
	`2402`	`+ effect = nextNextEffect;`
`2400`	`2403`	`}`
`2401`	`2404`
`2402`	`2405`	`if (enableProfilerTimer && enableProfilerCommitHooks) {`