Moved actualDuration bubbling to completeUnitOfWork error branch

packages/react-reconciler/src/ReactFiberScheduler.js

@@ -1029,9 +1029,18 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
  return null;
  }
  } else {
- if (workInProgress.mode & ProfileMode) {
+ if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
  // Record the render duration for the fiber that errored.
  stopProfilerTimerIfRunningAndRecordDelta(workInProgress, false);
+
+ // Include the time spent working on failed children before continuing.
+ let actualDuration = workInProgress.actualDuration;
+ let child = workInProgress.child;
+ while (child !== null) {
+ actualDuration += child.actualDuration;
+ child = child.sibling;
+ }
+ workInProgress.actualDuration = actualDuration;
  }
 
  // This fiber did not complete because something threw. Pop values off
@@ -1056,19 +1065,6 @@ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
  ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
  }
 
- if (enableProfilerTimer) {
- // Include the time spent working on failed children before continuing.
- if (next.mode & ProfileMode) {
- let actualDuration = next.actualDuration;
- let child = next.child;
- while (child !== null) {
- actualDuration += child.actualDuration;
- child = child.sibling;
- }
- next.actualDuration = actualDuration;
- }
- }
-
  // If completing this work spawned new work, do that next. We'll come
  // back here again.
  // Since we're restarting, remove anything that is not a host effect
@@ -1286,16 +1282,6 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {
  // Record the time spent rendering before an error was thrown.
  // This avoids inaccurate Profiler durations in the case of a suspended render.
  stopProfilerTimerIfRunningAndRecordDelta(nextUnitOfWork, true);
-
- // HACK Also propagate actualDuration for the time spent in the fiber that errored.
- // This avoids inaccurate Profiler durations in the case of a suspended render.
- // This happens automatically for sync renders, because of resetChildExpirationTime.
- if (nextUnitOfWork.mode & ConcurrentMode) {
- const returnFiber = nextUnitOfWork.return;
- if (returnFiber !== null) {
- returnFiber.actualDuration += nextUnitOfWork.actualDuration;
- }
- }
  }
 
  if (__DEV__) {