https://github.com/alvinhochun approved this pull request. Thanks, looks good to me codewise. I haven't tested it myself but I trust that you have. This seems worth backporting to 17.x since it technically fixes a new regression. https://github.com/llvm/llvm-project/pull/67891