NoQ added a comment. Managed to reproduce the build error with `-fmodules` on my machine. Committed the updated patch as r257893, the buildbot seems happy. I hope this review is actually closed now :) http://reviews.llvm.org/D15448