Cherry-pick part of LLVM SVN r265828

This fixes build failures with recent Clang
1 file changed