https://github.com/fhahn commented: The pattern match looks fine to me. Spotted a few more remaining small things after another pass. LGTM with those addressed if possible https://github.com/llvm/llvm-project/pull/118828