That patch still seems like the wrong approach to me. Submitted alternative solution in r212038. Let me know if you have further problems with this. http://reviews.llvm.org/D4190