Meinersbur wrote: I think I have a more comprehensive fix here that does not need to introduce new maps to workaround bugs: #114237 Would you review it? I'd rebase it in that case. A patch that fixes a bug is not NFC. https://github.com/llvm/llvm-project/pull/114237