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

include/swift/Option/FrontendOptions.td

@@ -326,6 +326,8 @@ def warn_long_expression_type_checking : Separate<["-"], "warn-long-expression-t
 def warn_long_expression_type_checking_EQ : Joined<["-"], "warn-long-expression-type-checking=">,
   Alias<warn_long_expression_type_checking>;
 
+def solver_expression_time_threshold_EQ : Joined<["-"], "solver-expression-time-threshold=">;
+
 def enable_source_import : Flag<["-"], "enable-source-import">,
   HelpText<"Enable importing of Swift source files">;
 
@@ -366,6 +368,9 @@ def sil_link_all : Flag<["-"], "sil-link-all">,
 def sil_serialize_all : Flag<["-"], "sil-serialize-all">,
   HelpText<"Serialize all generated SIL">;
 
+def sil_serialize_witness_tables : Flag<["-"], "sil-serialize-witness-tables">,
+  HelpText<"Serialize eligible SIL witness tables">;
+
 def sil_verify_all : Flag<["-"], "sil-verify-all">,
   HelpText<"Verify SIL after each transform">;
 

include/swift/Option/SanitizerOptions.h

@@ -14,6 +14,8 @@
 #define SWIFT_OPTIONS_SANITIZER_OPTIONS_H
 
 #include "swift/Basic/Sanitizers.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Option/Arg.h"
 // FIXME: This include is just for llvm::SanitizerCoverageOptions. We should
@@ -26,10 +28,14 @@ class DiagnosticEngine;
 /// \brief Parses a -sanitize= argument's values.
 ///
 /// \param Diag If non null, the argument is used to diagnose invalid values.
+/// \param sanitizerRuntimeLibExists Function which checks for existance of a
+//         sanitizer dylib with a given name.
 /// \return Returns a SanitizerKind.
-SanitizerKind parseSanitizerArgValues(const llvm::opt::Arg *A,
-                                      const llvm::Triple &Triple,
-                                      DiagnosticEngine &Diag);
+SanitizerKind parseSanitizerArgValues(
+       const llvm::opt::Arg *A,
+       const llvm::Triple &Triple,
+       DiagnosticEngine &Diag,
+       llvm::function_ref<bool(llvm::StringRef)> sanitizerRuntimeLibExists);
 
 /// \brief Parses a -sanitize-coverage= argument's value.
 llvm::SanitizerCoverageOptions