Driver: expose -emit-module-source-info-path as a driver option

Author: nkcsgexi

cmake/modules/SwiftSource.cmake

@@ -311,10 +311,12 @@ function(_compile_swift_files
     if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
       set(specific_module_dir "${module_base}.swiftmodule")
       set(specific_module_private_dir "${specific_module_dir}/Private")
+      set(source_info_file "${specific_module_private_dir}/${SWIFTFILE_ARCHITECTURE}.swiftsourceinfo")
       set(module_base "${module_base}.swiftmodule/${SWIFTFILE_ARCHITECTURE}")
     else()
       set(specific_module_dir)
       set(specific_module_private_dir)
+      set(source_info_file "${module_base}.swiftsourceinfo")
     endif()
     set(module_file "${module_base}.swiftmodule")
     set(module_doc_file "${module_base}.swiftdoc")
@@ -324,6 +326,8 @@ function(_compile_swift_files
     set(sib_file "${module_base}.Onone.sib")
     set(sibopt_file "${module_base}.O.sib")
     set(sibgen_file "${module_base}.sibgen")
+    list(APPEND swift_module_flags
+         "-emit-module-source-info-path" "${source_info_file}")
 
     if(SWIFT_ENABLE_MODULE_INTERFACES)
       set(interface_file "${module_base}.swiftinterface")

include/swift/Driver/Driver.h

@@ -24,6 +24,7 @@
 #include "swift/Basic/OutputFileMap.h"
 #include "swift/Basic/Sanitizers.h"
 #include "swift/Driver/Util.h"
+#include "swift/Option/Options.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
@@ -358,7 +359,8 @@ class Driver {
                                    const TypeToPathMap *OutputMap,
                                    StringRef workingDirectory,
                                    CommandOutput *Output,
-                                   file_types::ID fileID) const;
+                                   file_types::ID fileID,
+                                   Optional<options::ID> DriverOptForPath = llvm::None) const;
 
   void chooseModuleInterfacePath(Compilation &C, const JobAction *JA,
                                  StringRef workingDirectory,

include/swift/Option/FrontendOptions.td

@@ -40,8 +40,6 @@ def emit_module_doc_path
 
 def emit_module_source_info : Flag<["-"], "emit-module-source-info">,
   HelpText<"Output module source info file">;
-def emit_module_source_info_path : Separate<["-"], "emit-module-source-info-path">,
-  HelpText<"Output module source info file to <path>">;
 
 def merge_modules
   : Flag<["-"], "merge-modules">, ModeOpt,

include/swift/Option/Options.td

@@ -364,6 +364,12 @@ def emit_module_interface_path :
          ArgumentIsPath]>,
   MetaVarName<"<path>">, HelpText<"Output module interface file to <path>">;
 
+def emit_module_source_info_path :
+  Separate<["-"], "emit-module-source-info-path">,
+  Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
+         ArgumentIsPath]>,
+  MetaVarName<"<path>">, HelpText<"Output module source info file to <path>">;
+
 def emit_parseable_module_interface :
   Flag<["-"], "emit-parseable-module-interface">,
   Alias<emit_module_interface>,

lib/Driver/Driver.cpp

@@ -2545,7 +2545,8 @@ Job *Driver::buildJobsForAction(Compilation &C, const JobAction *JA,
       (isa<CompileJobAction>(JA) || isa<MergeModuleJobAction>(JA))) {
     chooseSwiftModuleDocOutputPath(C, OutputMap, workingDirectory, Output.get());
     choosePrivateOutputFilePath(C, OutputMap, workingDirectory, Output.get(),
-                                file_types::TY_SwiftSourceInfoFile);
+                                file_types::TY_SwiftSourceInfoFile,
+                                options::OPT_emit_module_source_info_path);
   }
 
   if (C.getArgs().hasArg(options::OPT_emit_module_interface,
@@ -2793,9 +2794,17 @@ void Driver::choosePrivateOutputFilePath(Compilation &C,
                                          const TypeToPathMap *OutputMap,
                                          StringRef workingDirectory,
                                          CommandOutput *Output,
-                                         file_types::ID fileID) const {
+                                         file_types::ID fileID,
+                                         Optional<options::ID> optId) const {
   if (hasExistingAdditionalOutput(*Output, fileID))
     return;
+  // Honor driver option for this path if it's given
+  if (optId.hasValue()) {
+    if (const Arg *A = C.getArgs().getLastArg(*optId)) {
+      Output->setAdditionalOutputForType(fileID, StringRef(A->getValue()));
+      return;
+    }
+  }
 
   StringRef OFMOutputPath;
   if (OutputMap) {

test/Driver/sourceinfo_file.swift

@@ -2,10 +2,15 @@
 // RUN: mkdir -p %t/build/Private
 // RUN: %swiftc_driver -driver-print-jobs -emit-module %s -emit-module-path %t/build/sourceinfo_file.swiftmodule -module-name sourceinfo_file | %FileCheck %s -check-prefix CHECK-PRIVATE
 
-// CHECK-PRIVATE: Private/sourceinfo_file.swiftsourceinfo
+// CHECK-PRIVATE: build/Private/sourceinfo_file.swiftsourceinfo
 
 // RUN: %empty-directory(%t/build)
 // RUN: %swiftc_driver -driver-print-jobs -emit-module %s -emit-module-path %t/build/sourceinfo_file.swiftmodule -module-name sourceinfo_file | %FileCheck %s -check-prefix CHECK-NOPRIVATE
 
 // CHECK-NOPRIVATE-NOT: Private/sourceinfo_file.swiftsourceinfo
-// CHECK-NOPRIVATE: sourceinfo_file.swiftsourceinfo
+// CHECK-NOPRIVATE: build/sourceinfo_file.swiftsourceinfo
+
+// RUN: %empty-directory(%t/build)
+// RUN: %swiftc_driver -driver-print-jobs -emit-module %s -emit-module-path %t/build/sourceinfo_file.swiftmodule -module-name sourceinfo_file -emit-module-source-info-path %t/build/DriverPath.swiftsourceinfo | %FileCheck %s -check-prefix CHECK-DRIVER-OPT
+
+// CHECK-DRIVER-OPT: build/DriverPath.swiftsourceinfo