I just hit this bug too (see http://reviews.llvm.org/D8336), and I've committed this fix in r237857. Jean-Daniel - did you end up having any insights into the Right Way to fix this? REPOSITORY rL LLVM http://reviews.llvm.org/D8336 EMAIL PREFERENCES http://reviews.llvm.org/settings/panel/emailpreferences/