Use invokeGuardedCallback in place of Fiber try-catch blocks

Author: acdlite

src/renderers/shared/fiber/ReactFiberCommitWork.js

@@ -26,6 +26,7 @@ var {
 } = ReactTypeOfWork;
 var { commitCallbacks } = require('ReactFiberUpdateQueue');
 var { onCommitUnmount } = require('ReactFiberDevToolsHook');
+var { invokeGuardedCallback } = require('ReactErrorUtils');
 
 var {
   Placement,
@@ -52,24 +53,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     getPublicInstance,
   } = config;
 
-  // Capture errors so they don't interrupt unmounting.
-  function safelyCallComponentWillUnmount(current, instance) {
-    try {
-      instance.componentWillUnmount();
-    } catch (error) {
-      captureError(current, error);
-    }
-  }
-
   // Capture errors so they don't interrupt unmounting.
   function safelyDetachRef(current : Fiber) {
-    try {
-      const ref = current.ref;
-      if (ref !== null) {
-        ref(null);
+    const ref = current.ref;
+    if (ref !== null) {
+      const refError = invokeGuardedCallback(null, ref, null, null);
+      if (refError !== null) {
+        captureError(current, refError);
       }
-    } catch (error) {
-      captureError(current, error);
     }
   }
 
@@ -341,7 +332,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         safelyDetachRef(current);
         const instance = current.stateNode;
         if (typeof instance.componentWillUnmount === 'function') {
-          safelyCallComponentWillUnmount(current, instance);
+          const unmountError = invokeGuardedCallback(null, instance.componentWillUnmount, instance);
+          if (unmountError) {
+            captureError(current, unmountError);
+          }
         }
         return;
       }

src/renderers/shared/fiber/ReactFiberScheduler.js

@@ -34,6 +34,7 @@ var {
   getStackAddendumByWorkInProgressFiber,
 } = require('ReactComponentTreeHook');
 var { logCapturedError } = require('ReactFiberErrorLogger');
+var { invokeGuardedCallback } = require('ReactErrorUtils');
 
 var ReactFiberBeginWork = require('ReactFiberBeginWork');
 var ReactFiberCompleteWork = require('ReactFiberCompleteWork');
@@ -130,6 +131,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
   // Keeps track of whether we're currently in a work loop.
   let isPerformingWork : boolean = false;
 
+  // Keeps track of whether the current deadline has expired.
+  let deadlineHasExpired : boolean = false;
+
   // Keeps track of whether we should should batch sync updates.
   let isBatchingUpdates : boolean = false;
 
@@ -377,9 +381,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     // ref unmounts.
     nextEffect = firstEffect;
     while (nextEffect !== null) {
-      try {
-        commitAllHostEffects(finishedWork);
-      } catch (error) {
+      const error = invokeGuardedCallback(null, commitAllHostEffects, null, finishedWork);
+      if (error !== null) {
         invariant(
           nextEffect !== null,
           'Should have next effect. This error is likely caused by a bug ' +
@@ -407,9 +410,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     // This pass also triggers any renderer-specific initial effects.
     nextEffect = firstEffect;
     while (nextEffect !== null) {
-      try {
-        commitAllLifeCycles(finishedWork, nextEffect);
-      } catch (error) {
+      const error = invokeGuardedCallback(null, commitAllLifeCycles, null, finishedWork);
+      if (error !== null) {
         invariant(
           nextEffect !== null,
           'Should have next effect. This error is likely caused by a bug ' +
@@ -638,7 +640,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function workLoop(priorityLevel, deadline : Deadline | null, deadlineHasExpired : boolean) : boolean {
+  function workLoop(priorityLevel, deadline : Deadline | null) {
     // Clear any errors.
     clearErrors();
 
@@ -706,8 +708,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     if (hostRootTimeMarker) {
       console.timeEnd(hostRootTimeMarker);
     }
-
-    return deadlineHasExpired;
   }
 
   function performWork(priorityLevel : PriorityLevel, deadline : Deadline | null) {
@@ -718,7 +718,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     );
     isPerformingWork = true;
     const isPerformingDeferredWork = Boolean(deadline);
-    let deadlineHasExpired = false;
 
     // This outer loop exists so that we can restart the work loop after
     // catching an error. It also lets us flush Task work at the end of a
@@ -739,17 +738,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       // Nothing in performWork should be allowed to throw. All unsafe
       // operations must happen within workLoop, which is extracted to a
       // separate function so that it can be optimized by the JS engine.
-      try {
-        priorityContextBeforeReconciliation = priorityContext;
-        priorityContext = nextPriorityLevel;
-        deadlineHasExpired = workLoop(priorityLevel, deadline, deadlineHasExpired);
-      } catch (error) {
+      priorityContextBeforeReconciliation = priorityContext;
+      const error = invokeGuardedCallback(null, workLoop, null, priorityLevel, deadline);
+      // Reset the priority context to its value before reconcilation.
+      priorityContext = priorityContextBeforeReconciliation;
+
+      if (error !== null) {
         // We caught an error during either the begin or complete phases.
         const failedWork = nextUnitOfWork;
         if (failedWork !== null) {
-          // Reset the priority context to its value before reconcilation.
-          priorityContext = priorityContextBeforeReconciliation;
-
           // "Capture" the error by finding the nearest boundary. If there is no
           // error boundary, the nearest host container acts as one. If
           // captureError returns null, the error was intentionally ignored.
@@ -780,8 +777,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
           // inside resetAfterCommit.
           fatalError = error;
         }
-      } finally {
-        priorityContext = priorityContextBeforeReconciliation;
       }
 
       // Stop performing work
@@ -824,6 +819,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
 
     // We're done performing work. Time to clean up.
     isPerformingWork = false;
+    deadlineHasExpired = false;
     fatalError = null;
     firstUncaughtError = null;
     capturedErrors = null;