diff --git a/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt b/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt
index c0d80adaac0b..82c12a47fa93 100644
--- a/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt
+++ b/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt
@@ -1,5 +1,14 @@
 set(LLVM_LINK_COMPONENTS support)
 
+# The registry source file ends up generating a lot of sections for each
+# matcher. Each matcher appears to get a vtable and several methods. Each
+# method needs .text, .pdata, .xdata, and .debug sections, adding to the
+# section multiplier. By default MSVC has a 2^16 limit on the number of
+# sections in an object file, and this needs more than that.
+if (MSVC)
+  set_source_files_properties(Registry.cpp PROPERTIES COMPILE_FLAGS /bigobj)
+endif()
+
 add_clang_library(clangDynamicASTMatchers
   Diagnostics.cpp
   VariantValue.cpp