https://github.com/fhahn approved this pull request. LGTM, thanks. Might be good to wait for a few more days before landing this, to see if any new asserts show up after landing the previous patch https://github.com/llvm/llvm-project/pull/136858