tstellar wrote: @zmodem @petrhosek I have a fix here: https://github.com/llvm/llvm-project/pull/73610 If the fix is good, then I'll push it first and let it sit in main awhile before re-committing the reverted patch. https://github.com/llvm/llvm-project/pull/72955