Sorry, I'm missing a bit of context for this patch. Could you explain in the commit message why this is the right thing to do? http://reviews.llvm.org/D4181