Add more robust handling of nested query cycles#154389

Zoxc wants to merge 2 commits intorust-lang:mainrust-lang/rust:mainfrom

Zoxc:nested-cyclesZoxc/rust:nested-cyclesCopy head branch name to clipboard