omtcyfz added a comment. besides, let me push one thing; it's about passing a vector of USRs to the USRLocFinder instead of passing them 1 by 1; removes a need to write that `FIXME` of yours :) https://reviews.llvm.org/D21814