Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 89b8f0df904b · 2019-04-11T14:09:58.000-07:00
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -136,6 +136,6 @@ else()
   set(swift_ast_verifier_flag " -DSWIFT_DISABLE_AST_VERIFIER=1")
 endif()
 
-set_property(SOURCE Verifier.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
+set_property(SOURCE ASTVerifier.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
   "${swift_ast_verifier_flag}")
 
