Fix build with gcc 6.

llvm-svn: 275972
4 files changed