I guess there's not necessarily a need to land this upstream if it's just going to have to change right away. We can land it on our 3.5 branch and adjust it as needed later. http://reviews.llvm.org/D6208