Another comment is that it needs testcases, I'd also like a testcase that has multiple CUs to make sure we can handle that. I'm looking more at the patch as well. http://llvm-reviews.chandlerc.com/D1649