mprobst added a comment. Sorry, my automated test run somehow didn't fail, and so I implemented your suggestion which actually did break formatting. Could you post-commit review this? It's already committed to fix the build. http://reviews.llvm.org/D21691