https://github.com/j-hui commented: Thanks! This looks good to me overall and I'm ok with merging this, but I think the parameter selector extraction + matching could be cleaned up a bit, perhaps as a follow up patch. https://github.com/llvm/llvm-project/pull/205307