jingham added a subscriber: jingham. jingham added a comment. I'll let Greg weigh in on the actual details, but if as I understand the patch, the m_die_to_index_map only stored CU dies, can you make the name of the ivar indicate that fact? http://reviews.llvm.org/D11390