mmiftahx wrote: @StevenYangCC I needed this fix for a series and posted it as #229318, with a test that checks the entry is kept, as ro-i asked here. If you'd rather finish this one, I'll close mine. https://github.com/llvm/llvm-project/pull/192200