I'm abandoning this patch because there is another way to deal with my problem for code coverage, and thus I think that I would also like to keep the non-canonical names in the coverage data. http://reviews.llvm.org/D4745