Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: explicitly warn for infinite loops discovered only via enableInf… · react/react@fef12a0 · GitHub
Skip to content

Commit fef12a0

Browse files
authored
fix: explicitly warn for infinite loops discovered only via enableInfiniteRenderLoopDetection (#36195)
My change in #35999 did not cover all possible scenarios for emitting a warning, instead of throwing. The instrumentation not only enables the identification for the infinite loop via execution context checks, but also adds the check to more lifecycle methods, like `markRootPinged` and `markRootUpdated`. See the newly added test to understand a potential scenario. Before the fix, the error would be thrown: <img width="1192" height="424" alt="Screenshot 2026-04-08 at 17 21 51" src="https://github.com/user-attachments/assets/ba8ea379-0271-4938-ae45-e37ee75e1963" /> With the current changes, the warning is logged with `console.error`.
1 parent 705268d commit fef12a0

3 files changed

Lines changed: 119 additions & 5 deletions

File tree

‎packages/react-dom/src/__tests__/ReactUpdates-test.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,115 @@ describe('ReactUpdates', () => {
20062006
]);
20072007
});
20082008

2009+
it('warns instead of throwing when infinite Suspense ping loop is detected via enableInfiniteRenderLoopDetection during commit phase',async()=>{
2010+
if(!__DEV__||gate(flags=>!flags.enableInfiniteRenderLoopDetection)){
2011+
return;
2012+
}
2013+
2014+
// When a Suspense child throws a thenable, React registers two listeners:
2015+
// 1. ping (attachPingListener, render) → pingSuspendedRoot → markRootPinged
2016+
// 2. retry (attachSuspenseRetryListeners, commit) → resolveRetryWakeable
2017+
//
2018+
// The ping path calls throwIfInfiniteUpdateLoopDetected(true) via
2019+
// markRootPinged WITHOUT a prior getRootForUpdatedFiber(false) check.
2020+
// When this fires during CommitContext (not RenderContext),
2021+
// the isFromInfiniteRenderLoopDetectionInstrumentation=true parameter
2022+
// ensures we warn instead of throw.
2023+
//
2024+
// Without the fix (passing false), the condition
2025+
// false || (executionContext & RenderContext && ...)
2026+
// evaluates to false in CommitContext, causing a throw.
2027+
letcurrentResolve=null;
2028+
letshouldStop=false;
2029+
2030+
functionApp(){
2031+
const[,setState]=React.useState(0);
2032+
2033+
React.useLayoutEffect(()=>{
2034+
if(shouldStop){
2035+
return;
2036+
}
2037+
// Resolve the suspended thenable during commit phase (CommitContext).
2038+
// The ping callback (registered first during render) fires first,
2039+
// triggering markRootPinged → throwIfInfiniteUpdateLoopDetected(true).
2040+
if(currentResolve!==null){
2041+
constresolve=currentResolve;
2042+
currentResolve=null;
2043+
resolve();
2044+
}
2045+
// Schedule a sync update to ensure nestedUpdateKind is
2046+
// NESTED_UPDATE_SYNC_LANE at commitRootImpl epilogue.
2047+
setState(n=>n+1);
2048+
});
2049+
2050+
return(
2051+
<React.Suspensefallback="loading">
2052+
<SuspendingChild/>
2053+
</React.Suspense>
2054+
);
2055+
}
2056+
2057+
functionSuspendingChild(){
2058+
if(shouldStop){
2059+
returnnull;
2060+
}
2061+
// Each render throws a new thenable. React calls .then() on it twice
2062+
// (ping during render, retry during commit). We collect all callbacks
2063+
// so resolve() fires them in registration order: ping first.
2064+
constcallbacks=[];
2065+
constthenable={
2066+
then(onFulfilled){
2067+
callbacks.push(onFulfilled);
2068+
currentResolve=()=>{
2069+
for(leti=0;i<callbacks.length;i++){
2070+
callbacks[i]();
2071+
}
2072+
};
2073+
},
2074+
};
2075+
2076+
throwthenable;
2077+
}
2078+
2079+
constcontainer=document.createElement('div');
2080+
consterrors=[];
2081+
constroot=ReactDOMClient.createRoot(container,{
2082+
onUncaughtError: error=>{
2083+
errors.push(error.message);
2084+
},
2085+
});
2086+
2087+
constoriginalConsoleError=console.error;
2088+
console.error=e=>{
2089+
if(
2090+
typeofe==='string'&&
2091+
e.startsWith(
2092+
'Maximum update depth exceeded. This could be an infinite loop.',
2093+
)
2094+
){
2095+
// Stop the loop after the first warning so act() can finish.
2096+
shouldStop=true;
2097+
}
2098+
};
2099+
2100+
try{
2101+
awaitact(()=>{
2102+
root.render(<App/>);
2103+
});
2104+
}finally{
2105+
console.error=originalConsoleError;
2106+
}
2107+
2108+
// With the fix (throwIfInfiniteUpdateLoopDetected(true) in markRootPinged):
2109+
// the loop is discovered via enableInfiniteRenderLoopDetection instrumentation
2110+
// and produces a warning.
2111+
// Without the fix (throwIfInfiniteUpdateLoopDetected(false)):
2112+
// the same check throws because executionContext is CommitContext, not
2113+
// RenderContext.
2114+
expect(shouldStop).toBe(true);
2115+
expect(errors).toEqual([]);
2116+
});
2117+
20092118
it('prevents infinite update loop triggered by too many updates in ref callbacks',async()=>{
20102119
letscheduleUpdate;
20112120
functionTooManyRefUpdates(){

‎packages/react-reconciler/src/ReactFiberConcurrentUpdates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function getRootForUpdatedFiber(sourceFiber: Fiber): FiberRoot | null {
254254
// current behavior we've used for several release cycles. Consider not
255255
// performing this check if the updated fiber already unmounted, since it's
256256
// not possible for that to cause an infinite update loop.
257-
throwIfInfiniteUpdateLoopDetected();
257+
throwIfInfiniteUpdateLoopDetected(false);
258258

259259
// When a setState happens, we must ensure the root is scheduled. Because
260260
// update queues do not have a backpointer to the root, the only way to do

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ function markRootUpdated(root: FiberRoot, updatedLanes: Lanes) {
17541754
didIncludeCommitPhaseUpdate=true;
17551755
}
17561756

1757-
throwIfInfiniteUpdateLoopDetected();
1757+
throwIfInfiniteUpdateLoopDetected(true);
17581758
}
17591759
}
17601760

@@ -1773,7 +1773,7 @@ function markRootPinged(root: FiberRoot, pingedLanes: Lanes) {
17731773
didIncludeCommitPhaseUpdate=true;
17741774
}
17751775

1776-
throwIfInfiniteUpdateLoopDetected();
1776+
throwIfInfiniteUpdateLoopDetected(true);
17771777
}
17781778
}
17791779

@@ -5175,7 +5175,9 @@ export function resolveRetryWakeable(boundaryFiber: Fiber, wakeable: Wakeable) {
51755175
retryTimedOutBoundary(boundaryFiber,retryLane);
51765176
}
51775177

5178-
exportfunctionthrowIfInfiniteUpdateLoopDetected(){
5178+
exportfunctionthrowIfInfiniteUpdateLoopDetected(
5179+
isFromInfiniteRenderLoopDetectionInstrumentation: boolean,
5180+
){
51795181
if(nestedUpdateCount>NESTED_UPDATE_LIMIT){
51805182
nestedUpdateCount=0;
51815183
nestedPassiveUpdateCount=0;
@@ -5187,7 +5189,10 @@ export function throwIfInfiniteUpdateLoopDetected() {
51875189

51885190
if(enableInfiniteRenderLoopDetection){
51895191
if(updateKind===NESTED_UPDATE_SYNC_LANE){
5190-
if(executionContext&RenderContext&&workInProgressRoot!==null){
5192+
if(
5193+
isFromInfiniteRenderLoopDetectionInstrumentation||
5194+
(executionContext&RenderContext&&workInProgressRoot!==null)
5195+
){
51915196
// This loop was identified only because of the instrumentation gated with enableInfiniteRenderLoopDetection, warn instead of throwing.
51925197
if(__DEV__){
51935198
console.error(

0 commit comments

Comments
 (0)