Avoid copying strings and PrimarySpecificPaths.

Author: davidungar

include/swift/IRGen/IRGenPublic.h

@@ -26,7 +26,7 @@ class IRGenModule;
 
 /// Create an IRGen module.
 std::pair<IRGenerator *, IRGenModule *>
-createIRGenModule(SILModule *SILMod, PrimarySpecificPaths PSPs,
+createIRGenModule(SILModule *SILMod, const PrimarySpecificPaths &PSPs,
                   llvm::LLVMContext &LLVMContext);
 
 /// Delete the IRGenModule and IRGenerator obtained by the above call.

include/swift/Subsystems.h

@@ -260,7 +260,7 @@ namespace swift {
   std::unique_ptr<llvm::Module>
   performIRGeneration(IRGenOptions &Opts, ModuleDecl *M,
                       std::unique_ptr<SILModule> SILMod,
-                      StringRef ModuleName, PrimarySpecificPaths PSPs,
+                      StringRef ModuleName, const PrimarySpecificPaths &PSPs,
                       llvm::LLVMContext &LLVMContext,
                       ArrayRef<std::string> parallelOutputFilenames,
                       llvm::GlobalVariable **outModuleHash = nullptr);
@@ -271,7 +271,7 @@ namespace swift {
   std::unique_ptr<llvm::Module>
   performIRGeneration(IRGenOptions &Opts, SourceFile &SF,
                       std::unique_ptr<SILModule> SILMod,
-                      StringRef ModuleName, PrimarySpecificPaths PSPs,
+                      StringRef ModuleName, const PrimarySpecificPaths &PSPs,
                       llvm::LLVMContext &LLVMContext,
                       unsigned StartElem = 0,
                       llvm::GlobalVariable **outModuleHash = nullptr);

lib/FrontendTool/FrontendTool.cpp

@@ -1082,11 +1082,11 @@ static bool serializeSIB(FrontendOptions &opts, SILModule *SM,
 }
 
 static void generateIR(IRGenOptions &IRGenOpts, std::unique_ptr<SILModule> SM,
-                       PrimarySpecificPaths PSPs,
+                       const PrimarySpecificPaths &PSPs,
                        StringRef OutputFilename, ModuleOrSourceFile MSF,
                        std::unique_ptr<llvm::Module> &IRModule,
                        llvm::GlobalVariable *&HashGlobal,
-                       std::vector<std::string> parallelOutputFilenames) {
+                       ArrayRef<std::string> parallelOutputFilenames) {
   // FIXME: We shouldn't need to use the global context here, but
   // something is persisting across calls to performIRGeneration.
   auto &LLVMContext = getGlobalLLVMContext();
@@ -1316,12 +1316,13 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
     return processCommandLineAndRunImmediately(
         Invocation, Instance, std::move(SM), MSF, observer, ReturnValue);
 
-  const std::string OutputFilename = PSPs.OutputFilename;
+  StringRef OutputFilename = PSPs.OutputFilename;
+  std::vector<std::string> ParallelOutputFilenames = Invocation.getFrontendOptions().InputsAndOutputs.copyOutputFilenames();
   std::unique_ptr<llvm::Module> IRModule;
   llvm::GlobalVariable *HashGlobal;
   generateIR(
       IRGenOpts, std::move(SM), PSPs, OutputFilename, MSF, IRModule, HashGlobal,
-      Invocation.getFrontendOptions().InputsAndOutputs.copyOutputFilenames());
+      ParallelOutputFilenames);
 
   // Walk the AST for indexing after IR generation. Walking it before seems
   // to cause miscompilation issues.

lib/IRGen/IRGen.cpp

@@ -665,7 +665,8 @@ static void initLLVMModule(const IRGenModule &IGM) {
 }
 
 std::pair<IRGenerator *, IRGenModule *>
-swift::irgen::createIRGenModule(SILModule *SILMod, PrimarySpecificPaths PSPs,
+swift::irgen::createIRGenModule(SILModule *SILMod,
+                                const PrimarySpecificPaths &PSPs,
                                 llvm::LLVMContext &LLVMContext) {
 
   IRGenOptions Opts;
@@ -716,7 +717,7 @@ static std::unique_ptr<llvm::Module> performIRGeneration(IRGenOptions &Opts,
                                                          swift::ModuleDecl *M,
                                             std::unique_ptr<SILModule> SILMod,
                                                          StringRef ModuleName,
-                                              const PrimarySpecificPaths PSPs,
+                                              const PrimarySpecificPaths &PSPs,
                                                  llvm::LLVMContext &LLVMContext,
                                                        SourceFile *SF = nullptr,
                                  llvm::GlobalVariable **outModuleHash = nullptr,
@@ -867,7 +868,7 @@ static void ThreadEntryPoint(IRGenerator *irgen,
 static void performParallelIRGeneration(IRGenOptions &Opts,
                                         swift::ModuleDecl *M,
                                         std::unique_ptr<SILModule> SILMod,
-                                        const PrimarySpecificPaths PSPs,
+                                        const PrimarySpecificPaths &PSPs,
                                         StringRef ModuleName, int numThreads,
                                         ArrayRef<std::string> outputFilenames) {
 
@@ -1083,7 +1084,7 @@ static void performParallelIRGeneration(IRGenOptions &Opts,
 std::unique_ptr<llvm::Module> swift::
 performIRGeneration(IRGenOptions &Opts, swift::ModuleDecl *M,
                     std::unique_ptr<SILModule> SILMod,
-                    StringRef ModuleName, const PrimarySpecificPaths PSPs,
+                    StringRef ModuleName, const PrimarySpecificPaths &PSPs,
                     llvm::LLVMContext &LLVMContext,
                     ArrayRef<std::string> parallelOutputFilenames,
                     llvm::GlobalVariable **outModuleHash) {
@@ -1103,7 +1104,7 @@ performIRGeneration(IRGenOptions &Opts, swift::ModuleDecl *M,
 std::unique_ptr<llvm::Module> swift::
 performIRGeneration(IRGenOptions &Opts, SourceFile &SF,
                     std::unique_ptr<SILModule> SILMod,
-                    StringRef ModuleName, const PrimarySpecificPaths PSPs,
+                    StringRef ModuleName, const PrimarySpecificPaths &PSPs,
                     llvm::LLVMContext &LLVMContext,
                     unsigned StartElem,
                     llvm::GlobalVariable **outModuleHash) {

lib/IRGen/IRGenModule.cpp

@@ -125,7 +125,7 @@ static clang::CodeGenerator *createClangCodeGenerator(ASTContext &Context,
 IRGenModule::IRGenModule(IRGenerator &irgen,
                          std::unique_ptr<llvm::TargetMachine> &&target,
                          SourceFile *SF, llvm::LLVMContext &LLVMContext,
-                         StringRef ModuleName, PrimarySpecificPaths PSPs)
+                         StringRef ModuleName, const PrimarySpecificPaths &PSPs)
     : IRGen(irgen), Context(irgen.SIL.getASTContext()),
       ClangCodeGen(createClangCodeGenerator(Context, LLVMContext, irgen.Opts,
                                             ModuleName)),

lib/IRGen/IRGenModule.h

@@ -1043,7 +1043,7 @@ private:                            \
               std::unique_ptr<llvm::TargetMachine> &&target,
               SourceFile *SF, llvm::LLVMContext &LLVMContext,
               StringRef ModuleName,
-              PrimarySpecificPaths PSPs);
+              const PrimarySpecificPaths &PSPs);
   ~IRGenModule();
 
   llvm::LLVMContext &getLLVMContext() const { return LLVMContext; }