-
Notifications
You must be signed in to change notification settings - Fork 47.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix DEV performance regression by avoiding Object.assign on Fibers #12510
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,7 +72,7 @@ import { | |
startCommitLifeCyclesTimer, | ||
stopCommitLifeCyclesTimer, | ||
} from './ReactDebugFiberPerf'; | ||
import {createWorkInProgress} from './ReactFiber'; | ||
import {createWorkInProgress, assignFiberPropertiesInDEV} from './ReactFiber'; | ||
import {onCommitRoot} from './ReactFiberDevToolsHook'; | ||
import { | ||
NoWork, | ||
|
@@ -260,7 +260,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>( | |
stashedWorkInProgressProperties = null; | ||
replayUnitOfWork = (failedUnitOfWork: Fiber, isAsync: boolean) => { | ||
// Retore the original state of the work-in-progress | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Typo in |
||
Object.assign(failedUnitOfWork, stashedWorkInProgressProperties); | ||
assignFiberPropertiesInDEV( | ||
failedUnitOfWork, | ||
stashedWorkInProgressProperties, | ||
); | ||
switch (failedUnitOfWork.tag) { | ||
case HostRoot: | ||
popHostContainer(failedUnitOfWork); | ||
|
@@ -787,7 +790,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>( | |
} | ||
|
||
if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) { | ||
stashedWorkInProgressProperties = Object.assign({}, workInProgress); | ||
stashedWorkInProgressProperties = assignFiberPropertiesInDEV( | ||
stashedWorkInProgressProperties, | ||
workInProgress, | ||
); | ||
} | ||
let next = beginWork(current, workInProgress, nextRenderExpirationTime); | ||
|
||
|
43 changes: 43 additions & 0 deletions
43
packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/** | ||
* Copyright (c) 2013-present, Facebook, Inc. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @jest-environment node | ||
*/ | ||
|
||
'use strict'; | ||
|
||
describe('ReactIncrementalErrorReplay-test', () => { | ||
it('copies all keys when stashing potentially failing work', () => { | ||
// Note: this test is fragile and relies on internals. | ||
// We almost always try to avoid such tests, but here the cost of | ||
// the list getting out of sync (and causing subtle bugs in rare cases) | ||
// is higher than the cost of maintaing the test. | ||
const { | ||
// Any Fiber factory function will do. | ||
createHostRootFiber, | ||
// This is the method we're going to test. | ||
// If this is no longer used, you can delete this test file. | ||
assignFiberPropertiesInDEV, | ||
} = require('../ReactFiber'); | ||
|
||
// Get a real fiber. | ||
const realFiber = createHostRootFiber(false); | ||
const stash = assignFiberPropertiesInDEV(null, realFiber); | ||
|
||
// Verify we get all the same fields. | ||
expect(realFiber).toEqual(stash); | ||
|
||
// Mutate the original. | ||
for (let key in realFiber) { | ||
realFiber[key] = key + '_' + Math.random(); | ||
} | ||
expect(realFiber).not.toEqual(stash); | ||
|
||
// Verify we can still "revert" to the stashed properties. | ||
expect(assignFiberPropertiesInDEV(realFiber, stash)).toBe(realFiber); | ||
expect(realFiber).toEqual(stash); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe a test by comparing |
||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be nice if there was a way to validate that all the enumerable keys from
source
were indeed copied totarget
, but where would you put it?__DEV__
?Any way to write a test to see if nothing is missing, or not all fibers have the expected properties?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the goal is to be super fast I think the tradeoff of writing an “internal” test for this (and doing no validation in DEV) is the right one.