Skip to content

Commit 5776f4e

Browse files
committed
Remove execution context check from shouldProfile (#30971)
I don't know why this is here since all these callsites are within the CommitWork/CommitEffects helpers. This should help with inlining. DiffTrain build for [8152e5c](8152e5c)
1 parent f5d6218 commit 5776f4e

34 files changed

+1415
-1518
lines changed

compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d7167c35059bc6a0ad84eb34e65b3b66328d5dd8
1+
8152e5cd27721e792f395c0b62c8a7769a54777a
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d7167c35059bc6a0ad84eb34e65b3b66328d5dd8
1+
8152e5cd27721e792f395c0b62c8a7769a54777a

compiled/facebook-www/React-dev.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,7 @@ __DEV__ &&
20012001
exports.useTransition = function () {
20022002
return resolveDispatcher().useTransition();
20032003
};
2004-
exports.version = "19.0.0-www-classic-d7167c35-20240916";
2004+
exports.version = "19.0.0-www-classic-8152e5cd-20240916";
20052005
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
20062006
"function" ===
20072007
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-dev.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ __DEV__ &&
19811981
exports.useTransition = function () {
19821982
return resolveDispatcher().useTransition();
19831983
};
1984-
exports.version = "19.0.0-www-modern-d7167c35-20240916";
1984+
exports.version = "19.0.0-www-modern-8152e5cd-20240916";
19851985
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
19861986
"function" ===
19871987
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-prod.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
665665
exports.useTransition = function () {
666666
return ReactSharedInternals.H.useTransition();
667667
};
668-
exports.version = "19.0.0-www-classic-d7167c35-20240916";
668+
exports.version = "19.0.0-www-classic-8152e5cd-20240916";

compiled/facebook-www/React-prod.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
665665
exports.useTransition = function () {
666666
return ReactSharedInternals.H.useTransition();
667667
};
668-
exports.version = "19.0.0-www-modern-d7167c35-20240916";
668+
exports.version = "19.0.0-www-modern-8152e5cd-20240916";

compiled/facebook-www/React-profiling.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
669669
exports.useTransition = function () {
670670
return ReactSharedInternals.H.useTransition();
671671
};
672-
exports.version = "19.0.0-www-classic-d7167c35-20240916";
672+
exports.version = "19.0.0-www-classic-8152e5cd-20240916";
673673
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
674674
"function" ===
675675
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-profiling.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
669669
exports.useTransition = function () {
670670
return ReactSharedInternals.H.useTransition();
671671
};
672-
exports.version = "19.0.0-www-modern-d7167c35-20240916";
672+
exports.version = "19.0.0-www-modern-8152e5cd-20240916";
673673
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
674674
"function" ===
675675
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/ReactART-dev.classic.js

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9663,10 +9663,7 @@ __DEV__ &&
96639663
}
96649664
}
96659665
function shouldProfile$1(current) {
9666-
return (
9667-
0 !== (current.mode & 2) &&
9668-
(executionContext & CommitContext) !== NoContext
9669-
);
9666+
return 0 !== (current.mode & 2);
96709667
}
96719668
function commitHookLayoutEffects(finishedWork, hookFlags) {
96729669
shouldProfile$1(finishedWork)
@@ -10068,26 +10065,6 @@ __DEV__ &&
1006810065
commitTime
1006910066
);
1007010067
}
10071-
function commitProfilerUpdate(
10072-
finishedWork,
10073-
current,
10074-
commitTime,
10075-
effectDuration
10076-
) {
10077-
if (executionContext & CommitContext)
10078-
try {
10079-
runWithFiberInDEV(
10080-
finishedWork,
10081-
commitProfiler,
10082-
finishedWork,
10083-
current,
10084-
commitTime,
10085-
effectDuration
10086-
);
10087-
} catch (error$20) {
10088-
captureCommitPhaseError(finishedWork, finishedWork.return, error$20);
10089-
}
10090-
}
1009110068
function commitProfilerPostCommitImpl(
1009210069
finishedWork,
1009310070
current,
@@ -10238,12 +10215,6 @@ __DEV__ &&
1023810215
);
1023910216
}
1024010217
}
10241-
function shouldProfile(current) {
10242-
return (
10243-
0 !== (current.mode & 2) &&
10244-
(executionContext & CommitContext) !== NoContext
10245-
);
10246-
}
1024710218
function commitBeforeMutationEffects(root, firstChild) {
1024810219
focusedInstanceHandle = null;
1024910220
for (nextEffect = firstChild; null !== nextEffect; ) {
@@ -10462,14 +10433,26 @@ __DEV__ &&
1046210433
break;
1046310434
case 12:
1046410435
recursivelyTraverseLayoutEffects(finishedRoot, finishedWork);
10465-
if (flags & 4)
10466-
a: for (
10467-
flags = finishedWork.stateNode.effectDuration,
10468-
commitProfilerUpdate(finishedWork, current, commitTime, flags),
10469-
finishedWork = finishedWork.return;
10470-
null !== finishedWork;
10471-
10472-
) {
10436+
if (flags & 4) {
10437+
flags = finishedWork.stateNode.effectDuration;
10438+
try {
10439+
runWithFiberInDEV(
10440+
finishedWork,
10441+
commitProfiler,
10442+
finishedWork,
10443+
current,
10444+
commitTime,
10445+
flags
10446+
);
10447+
} catch (error$20) {
10448+
captureCommitPhaseError(
10449+
finishedWork,
10450+
finishedWork.return,
10451+
error$20
10452+
);
10453+
}
10454+
finishedWork = finishedWork.return;
10455+
a: for (; null !== finishedWork; ) {
1047310456
switch (finishedWork.tag) {
1047410457
case 3:
1047510458
finishedWork.stateNode.effectDuration += flags;
@@ -10480,6 +10463,7 @@ __DEV__ &&
1048010463
}
1048110464
finishedWork = finishedWork.return;
1048210465
}
10466+
}
1048310467
break;
1048410468
case 13:
1048510469
recursivelyTraverseLayoutEffects(finishedRoot, finishedWork);
@@ -10865,7 +10849,7 @@ __DEV__ &&
1086510849
(tag & Layout) === NoFlags ||
1086610850
(enableSchedulingProfiler &&
1086710851
markComponentLayoutEffectUnmountStarted(deletedFiber),
10868-
shouldProfile(deletedFiber)
10852+
0 !== (deletedFiber.mode & 2)
1086910853
? (startLayoutEffectTimer(),
1087010854
(inst.destroy = void 0),
1087110855
safelyCallDestroy(
@@ -10908,7 +10892,7 @@ __DEV__ &&
1090810892
: (tag & Layout) !== NoFlags &&
1090910893
(enableSchedulingProfiler &&
1091010894
markComponentLayoutEffectUnmountStarted(deletedFiber),
10911-
shouldProfile(deletedFiber)
10895+
0 !== (deletedFiber.mode & 2)
1091210896
? (startLayoutEffectTimer(),
1091310897
(inst.destroy = void 0),
1091410898
safelyCallDestroy(
@@ -11117,7 +11101,7 @@ __DEV__ &&
1111711101
finishedWork.return
1111811102
),
1111911103
commitHookEffectListMount(Insertion | HasEffect, finishedWork),
11120-
shouldProfile(finishedWork)
11104+
0 !== (finishedWork.mode & 2)
1112111105
? (startLayoutEffectTimer(),
1112211106
commitHookEffectListUnmount(
1112311107
Layout | HasEffect,
@@ -11432,7 +11416,7 @@ __DEV__ &&
1143211416
case 11:
1143311417
case 14:
1143411418
case 15:
11435-
if (shouldProfile(finishedWork))
11419+
if (0 !== (finishedWork.mode & 2))
1143611420
try {
1143711421
startLayoutEffectTimer(),
1143811422
commitHookEffectListUnmount(
@@ -11550,20 +11534,27 @@ __DEV__ &&
1155011534
finishedWork,
1155111535
includeWorkInProgressEffects
1155211536
);
11553-
if (includeWorkInProgressEffects && flags & 4)
11554-
a: for (
11555-
includeWorkInProgressEffects =
11556-
finishedWork.stateNode.effectDuration,
11557-
commitProfilerUpdate(
11558-
finishedWork,
11559-
current,
11560-
commitTime,
11561-
includeWorkInProgressEffects
11562-
),
11563-
finishedWork = finishedWork.return;
11564-
null !== finishedWork;
11565-
11566-
) {
11537+
if (includeWorkInProgressEffects && flags & 4) {
11538+
includeWorkInProgressEffects =
11539+
finishedWork.stateNode.effectDuration;
11540+
try {
11541+
runWithFiberInDEV(
11542+
finishedWork,
11543+
commitProfiler,
11544+
finishedWork,
11545+
current,
11546+
commitTime,
11547+
includeWorkInProgressEffects
11548+
);
11549+
} catch (error$20) {
11550+
captureCommitPhaseError(
11551+
finishedWork,
11552+
finishedWork.return,
11553+
error$20
11554+
);
11555+
}
11556+
finishedWork = finishedWork.return;
11557+
a: for (; null !== finishedWork; ) {
1156711558
switch (finishedWork.tag) {
1156811559
case 3:
1156911560
finishedWork.stateNode.effectDuration +=
@@ -11576,6 +11567,7 @@ __DEV__ &&
1157611567
}
1157711568
finishedWork = finishedWork.return;
1157811569
}
11570+
}
1157911571
break;
1158011572
case 13:
1158111573
recursivelyTraverseReappearLayoutEffects(
@@ -11803,7 +11795,7 @@ __DEV__ &&
1180311795
committedLanes,
1180411796
committedTransitions
1180511797
);
11806-
if (flags & 2048 && executionContext & CommitContext)
11798+
if (flags & 2048)
1180711799
a: for (
1180811800
finishedRoot = finishedWork.stateNode.passiveEffectDuration,
1180911801
commitProfilerPostCommit(
@@ -17136,11 +17128,11 @@ __DEV__ &&
1713617128
(function () {
1713717129
var internals = {
1713817130
bundleType: 1,
17139-
version: "19.0.0-www-classic-d7167c35-20240916",
17131+
version: "19.0.0-www-classic-8152e5cd-20240916",
1714017132
rendererPackageName: "react-art",
1714117133
currentDispatcherRef: ReactSharedInternals,
1714217134
findFiberByHostInstance: getInstanceFromNode,
17143-
reconcilerVersion: "19.0.0-www-classic-d7167c35-20240916"
17135+
reconcilerVersion: "19.0.0-www-classic-8152e5cd-20240916"
1714417136
};
1714517137
internals.overrideHookState = overrideHookState;
1714617138
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -17174,7 +17166,7 @@ __DEV__ &&
1717417166
exports.Shape = Shape;
1717517167
exports.Surface = Surface;
1717617168
exports.Text = Text;
17177-
exports.version = "19.0.0-www-classic-d7167c35-20240916";
17169+
exports.version = "19.0.0-www-classic-8152e5cd-20240916";
1717817170
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1717917171
"function" ===
1718017172
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)