No, this CL doesn't add support for adaptative matchers, only polymorphic ones. I only moved the adaptative matchers from "need reimplementation" to their own category in the TODO list. I am changing this CL to be based on D815 to be able to choose the right polymorphic overload, so stay tuned. http://llvm-reviews.chandlerc.com/D794