Fix -module-summary-path handling between driver and frontend

Author: kateinoigakukun

include/swift/Option/FrontendOptions.td

@@ -41,10 +41,6 @@ def emit_module_doc_path
 def emit_module_source_info : Flag<["-"], "emit-module-source-info">,
   HelpText<"Output module source info file">;
 
-def module_summary_path
-  : Separate<["-"], "module-summary-path">, MetaVarName<"<path>">,
-    HelpText<"Combined module summary file <path>">;
-
 def ignore_module_source_info : Flag<["-"], "ignore-module-source-info">,
   HelpText<"Avoid getting source location from .swiftsourceinfo files">;
 

include/swift/Option/Options.td

@@ -445,6 +445,9 @@ def emit_module_summary_path :
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
          ArgumentIsPath, SupplementaryOutput]>,
   MetaVarName<"<path>">, HelpText<"Output module summary file to <path>">;
+def module_summary_path : Separate<["-"], "module-summary-path">,
+    Flags<[FrontendOption, ArgumentIsPath]>, MetaVarName<"<path>">,
+    HelpText<"Combined module summary file <path>">;
 
 def emit_module_interface :
   Flag<["-"], "emit-module-interface">,

lib/Driver/ToolChains.cpp

@@ -230,6 +230,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   inputArgs.AddLastArg(arguments, options::OPT_import_underlying_module);
   inputArgs.AddLastArg(arguments, options::OPT_module_cache_path);
   inputArgs.AddLastArg(arguments, options::OPT_module_link_name);
+  inputArgs.AddLastArg(arguments, options::OPT_module_summary_path);
   inputArgs.AddLastArg(arguments, options::OPT_nostdimport);
   inputArgs.AddLastArg(arguments, options::OPT_parse_stdlib);
   inputArgs.AddLastArg(arguments, options::OPT_resource_dir);