bjope wrote: This seems to at least work for the test cases that failed downstream after https://github.com/llvm/llvm-project/pull/70778 I'll try to run some more testing with this new patch over night. https://github.com/llvm/llvm-project/pull/74239