Only continue the work loop if the error was successfully captured

Author: acdlite

scripts/fiber/tests-failing.txt

@@ -291,9 +291,6 @@ src/renderers/shared/__tests__/ReactPerf-test.js
 * should not count time in a portal towards lifecycle method
 * should work when measurement starts during reconciliation
 
-src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
-* can handle if setState callback throws
-
 src/renderers/shared/hooks/__tests__/ReactComponentTreeHook-test.js
 * uses displayName or Unknown for classic components
 * uses displayName, name, or ReactComponent for modern components
@@ -393,6 +390,7 @@ src/renderers/shared/stack/reconciler/__tests__/ReactComponent-test.js
 * should support new-style refs with mixed-up owners
 * should call refs at the correct time
 * fires the callback after a component is rendered
+* throws usefully when rendering badly-typed elements
 
 src/renderers/shared/stack/reconciler/__tests__/ReactComponentLifeCycle-test.js
 * should carry through each of the phases of setup

scripts/fiber/tests-passing.txt

@@ -830,6 +830,7 @@ src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
 * skips will/DidUpdate when bailing unless an update was already in progress
 * performs batched updates at the end of the batch
 * can nest batchedUpdates
+* can handle if setState callback throws
 * merges and masks context
 * does not leak own context into context provider
 * provides context when reusing work

src/renderers/shared/fiber/ReactFiberScheduler.js

@@ -543,9 +543,10 @@ module.exports = function<T, P, I, TI, C>(config : HostConfig<T, P, I, TI, C>) {
             unwindContext(failedWork, boundary);
           }
           nextUnitOfWork = completeUnitOfWork(boundary);
+
+          // We were interupted by an error. Continue performing work.
+          shouldContinue = true;
         }
-        // We were interupted by an error. Continue performing work.
-        shouldContinue = true;
       } finally {
         shouldBatchUpdates = prevShouldBatchUpdates;
       }

src/renderers/shared/stack/reconciler/__tests__/ReactComponent-test.js

@@ -328,7 +328,7 @@ describe('ReactComponent', () => {
     expect(callback.mock.calls.length).toBe(3);
   });
 
-  xit('throws usefully when rendering badly-typed elements', () => {
+  it('throws usefully when rendering badly-typed elements', () => {
     spyOn(console, 'error');
 
     var X = undefined;