Building with MSVC broken by D30246 (Fix zip iterator interface)

The changes in ⚙ D30246 [ADT] Fix zip iterator interface. (Fix zip iterator interface) seem to trigger some sort of Visual Studio compiler bug, which causes the build to fail.

The build log contains hundreds of these errors:
include\llvm/ADT/STLExtras.h(374): fatal error C1001: An internal error has occurred in the compiler.
(compiler file 'f:\dd\vctools\compiler\cxxfe\sl\p1\c\parsetree.cpp', line 1123)
To work around this problem, try simplifying or changing the program near the locations listed above.
Please choose the Technical Support command on the Visual C++
Help menu, or open the Technical Support help file for more information (compiling source file utils\unittest\googletest\src\gtest-all.cc)
include\llvm/ADT/STLExtras.h(378): note: see reference to alias template instantiation 'zip_traits<ZipType,Iters...>' being compiled (compiling source file utils\unittest\googletest\src\gtest-all.cc)
include\llvm/ADT/STLExtras.h(419): note: see reference to class template instantiation 'llvm::detail::zip_common<ZipType,Iters...>' being compiled (compiling source file utils\unittest\googletest\src\gtest-all.cc)

I'm not really an expert on Windows, but which version of Visual
Studio are you using? We've got bots running on Windows that seem to
be coping (http://bb.pgr.jp/waterfall) so you might have just been
lucky with an older one (or newer!).

Cheers.

Tim.