move bailout flag from while loop

bvaughn · Jul 16, 2020 · dffb2d7 · dffb2d7
1 parent a4789b8
commit dffb2d7
Showing 1 changed file with 86 additions and 48 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -1796,21 +1796,21 @@ function resetChildLanes(completedWork: Fiber) {
   let newChildLanes = NoLanes;
   let subtreeTag = NoSubtreeTag;
 
-  // Bubble up the earliest expiration time.
-  if (enableProfilerTimer && (completedWork.mode & ProfileMode) !== NoMode) {
-    // In profiling mode, resetChildExpirationTime is also used to reset
-    // profiler durations.
-    let actualDuration = completedWork.actualDuration;
-    let treeBaseDuration = ((completedWork.selfBaseDuration: any): number);
-
-    let child = completedWork.child;
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes),
-      );
+  if (!didBailout) {
+    // Bubble up the earliest expiration time.
+    if (enableProfilerTimer && (completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      let actualDuration = completedWork.actualDuration;
+      let treeBaseDuration = ((completedWork.selfBaseDuration: any): number);
+
+      let child = completedWork.child;
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes),
+        );
 
-      if (!didBailout) {
         subtreeTag |= child.subtreeTag;
 
         const effectTag = child.effectTag;
@@ -1823,44 +1823,41 @@ function resetChildLanes(completedWork: Fiber) {
         if ((effectTag & LayoutMask) !== NoEffect) {
           subtreeTag |= Layout;
         }
-      }
 
-      // When a fiber is cloned, its actualDuration is reset to 0. This value will
-      // only be updated if work is done on the fiber (i.e. it doesn't bailout).
-      // When work is done, it should bubble to the parent's actualDuration. If
-      // the fiber has not been cloned though, (meaning no work was done), then
-      // this value will reflect the amount of time spent working on a previous
-      // render. In that case it should not bubble. We determine whether it was
-      // cloned by comparing the child pointer.
-      if (!didBailout) {
+        // When a fiber is cloned, its actualDuration is reset to 0. This value will
+        // only be updated if work is done on the fiber (i.e. it doesn't bailout).
+        // When work is done, it should bubble to the parent's actualDuration. If
+        // the fiber has not been cloned though, (meaning no work was done), then
+        // this value will reflect the amount of time spent working on a previous
+        // render. In that case it should not bubble. We determine whether it was
+        // cloned by comparing the child pointer.
         actualDuration += child.actualDuration;
+
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
       }
-      treeBaseDuration += child.treeBaseDuration;
-      child = child.sibling;
-    }
 
-    const isTimedOutSuspense =
-      completedWork.tag === SuspenseComponent &&
-      completedWork.memoizedState !== null;
-    if (isTimedOutSuspense) {
-      // Don't count time spent in a timed out Suspense subtree as part of the base duration.
-      const primaryChildFragment = completedWork.child;
-      if (primaryChildFragment !== null) {
-        treeBaseDuration -= ((primaryChildFragment.treeBaseDuration: any): number);
+      const isTimedOutSuspense =
+        completedWork.tag === SuspenseComponent &&
+        completedWork.memoizedState !== null;
+      if (isTimedOutSuspense) {
+        // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+        const primaryChildFragment = completedWork.child;
+        if (primaryChildFragment !== null) {
+          treeBaseDuration -= ((primaryChildFragment.treeBaseDuration: any): number);
+        }
       }
-    }
 
-    completedWork.actualDuration = actualDuration;
-    completedWork.treeBaseDuration = treeBaseDuration;
-  } else {
-    let child = completedWork.child;
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes),
-      );
+      completedWork.actualDuration = actualDuration;
+      completedWork.treeBaseDuration = treeBaseDuration;
+    } else {
+      let child = completedWork.child;
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes),
+        );
 
-      if (!didBailout) {
         subtreeTag |= child.subtreeTag;
 
         const effectTag = child.effectTag;
@@ -1873,15 +1870,56 @@ function resetChildLanes(completedWork: Fiber) {
         if ((effectTag & LayoutMask) !== NoEffect) {
           subtreeTag |= Layout;
         }
+
+        child = child.sibling;
+      }
+    }
+
+    completedWork.subtreeTag |= subtreeTag;
+  } else {
+    // Bubble up the earliest expiration time.
+    if (enableProfilerTimer && (completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      let treeBaseDuration = ((completedWork.selfBaseDuration: any): number);
+
+      let child = completedWork.child;
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes),
+        );
+
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
+      }
+
+      const isTimedOutSuspense =
+        completedWork.tag === SuspenseComponent &&
+        completedWork.memoizedState !== null;
+      if (isTimedOutSuspense) {
+        // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+        const primaryChildFragment = completedWork.child;
+        if (primaryChildFragment !== null) {
+          treeBaseDuration -= ((primaryChildFragment.treeBaseDuration: any): number);
+        }
       }
 
-      child = child.sibling;
+      completedWork.treeBaseDuration = treeBaseDuration;
+    } else {
+      let child = completedWork.child;
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes),
+        );
+
+        child = child.sibling;
+      }
     }
   }
 
   completedWork.childLanes = newChildLanes;
-
-  completedWork.subtreeTag |= subtreeTag;
 }
 
 function commitRoot(root) {