[ty] avoid fixpoint unioning of types containing current-cycle Divergent#21910

carljm merged 2 commits intomainastral-sh/ruff:mainfrom

cjm/nodivastral-sh/ruff:cjm/nodivCopy head branch name to clipboard