Move guarded callback closer to usage #21658
Closed
Conversation
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
facebook-github-bot
added
CLA Signed
React Core Team
|
Comparing: c153679...626cd53 Critical size changesIncludes critical production bundles, as well as any change greater than 2%:
Significant size changesIncludes any change greater than 0.2%: Expand to show
|
bvaughn
reviewed
Jun 11, 2021
| @@ -423,121 +450,106 @@ function commitBeforeMutationEffects_complete() { | |||
| } | |||
|
|
|||
| function commitBeforeMutationEffectsOnFiber(finishedWork: Fiber) { | |||
| const current = finishedWork.alternate; | |||
| const flags = finishedWork.flags; | |||
| setCurrentDebugFiberInDEV(finishedWork); | |||
There was a problem hiding this comment.
I don't think I like the removal of the Snapshot flag check around the switch statement. It seems a little weird to call a method that does not sound (but happens to be ) snapshot-specific (commitBeforeMutationEffectsOnFiber) and then do work without checking in that method.
There was a problem hiding this comment.
Can we add the outer check (so we don't do the guarded callback unnecessarily) and leave the inner check?
There was a problem hiding this comment.
I was looking at commitPassiveMountOnFiber which has the check outside. Overall I think there's some tension in this code between having generic naming and avoiding too many guards. I don't know what's a great way to balance but repeating the same check twice in a hot path also seems non-ideal?
There was a problem hiding this comment.
Agreed. My initial impression was that moving the check outside was not great (b'c less clear) but I see what you're saying too. I don't have strong feelings.
There was a problem hiding this comment.
Most fibers do not have a Snapshot flag set. It's a rare case. So with the guard, the most common case is a single check, then you bail out. Without the guard, you have to do at least one check (the switch case) then additional checks for some branches (like class components).
So I would add back the Snapshot check.
There was a problem hiding this comment.
Oh there's a check in the outer function. Nvm, didn't see that part.
|
Diff between two branches (easiest way to review IMO): |
acdlite
reviewed
Jun 15, 2021
| commitMutationEffectsOnFiber(fiber, root); | ||
| } catch (error) { | ||
| captureCommitPhaseError(fiber, fiber.return, error); | ||
| if (fiber.flags !== NoFlags) { |
There was a problem hiding this comment.
Suggested change
| if (fiber.flags !== NoFlags) { | |
| if ((fiber.flags & MutationMask) !== NoFlags) { |
|
Oh haha I didn't see #21666. Even better! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Based on #21657.
Changes:
(flags & Snapshot) !== NoFlagscheck out of the inner function. Leaves the inner function in guarded callback. ThebeforeActiveInstanceBlurstuff might need guarding in theory (though I'm not sure we're consistent about it now), so I wrapped it separately just to be safe.flagsareNoFlags. I readfiber.flagsbut should be ok because it's read inside right after anyway. All code inside only runs on non-zero flags so this should be safe.Why: so that we spend less time in DEV in these guarded callbacks that don't do anything. In particular, if Fiber has no effects.