Merge https://reviews.llvm.org/rL298569 to the 4.0.1 branch. Related bug: https://bugs.llvm.org/show_bug.cgi?id=32586
Will this work-around break if the bug is fixed in LLVM?
No, it works for both old and new outputs.
Go ahead and merge.
Merged in r301447.