Emit bitcode, reserve more space for native code dumping (JuliaLang#49173)

Author: pchintalapudi

src/aotcompile.cpp

@@ -945,7 +945,7 @@ struct ShardTimers {
 };
 
 // Perform the actual optimization and emission of the output files
-static void add_output_impl(Module &M, TargetMachine &SourceTM, std::string *outputs, StringRef *names,
+static void add_output_impl(Module &M, TargetMachine &SourceTM, std::string *outputs, const std::string *names,
                     NewArchiveMember *unopt, NewArchiveMember *opt, NewArchiveMember *obj, NewArchiveMember *asm_,
                     ShardTimers &timers, unsigned shardidx) {
     auto TM = std::unique_ptr<TargetMachine>(
@@ -965,6 +965,7 @@ static void add_output_impl(Module &M, TargetMachine &SourceTM, std::string *out
         AnalysisManagers AM{*TM, PB, OptimizationLevel::O0};
         ModulePassManager MPM;
         MPM.addPass(BitcodeWriterPass(OS));
+        MPM.run(M, AM.MAM);
         *unopt = NewArchiveMember(MemoryBufferRef(*outputs++, *names++));
         timers.unopt.stopTimer();
     }
@@ -1029,6 +1030,7 @@ static void add_output_impl(Module &M, TargetMachine &SourceTM, std::string *out
         AnalysisManagers AM{*TM, PB, OptimizationLevel::O0};
         ModulePassManager MPM;
         MPM.addPass(BitcodeWriterPass(OS));
+        MPM.run(M, AM.MAM);
         *opt = NewArchiveMember(MemoryBufferRef(*outputs++, *names++));
         timers.opt.stopTimer();
     }
@@ -1224,6 +1226,8 @@ static void add_output(Module &M, TargetMachine &TM, std::vector<std::string> &o
     unsigned outcount = unopt_out + opt_out + obj_out + asm_out;
     assert(outcount);
     outputs.resize(outputs.size() + outcount * threads * 2);
+    auto names_start = outputs.data() + outputs.size() - outcount * threads * 2;
+    auto outputs_start = names_start + outcount * threads;
     unopt.resize(unopt.size() + unopt_out * threads);
     opt.resize(opt.size() + opt_out * threads);
     obj.resize(obj.size() + obj_out * threads);
@@ -1264,7 +1268,7 @@ static void add_output(Module &M, TargetMachine &TM, std::vector<std::string> &o
         }
     }
     for (unsigned i = 0; i < threads; ++i) {
-        auto start = &outputs[outputs.size() - outcount * threads * 2 + i * outcount];
+        auto start = names_start + i * outcount;
         auto istr = std::to_string(i);
         if (unopt_out)
             *start++ = (name + "_unopt#" + istr + ".bc").str();
@@ -1278,10 +1282,7 @@ static void add_output(Module &M, TargetMachine &TM, std::vector<std::string> &o
     // Single-threaded case
     if (threads == 1) {
         output_timer.startTimer();
-        SmallVector<StringRef, 4> names;
-        for (unsigned i = outputs.size() - outcount * 2; i < outputs.size() - outcount; ++i)
-            names.push_back(outputs[i]);
-        add_output_impl(M, TM, outputs.data() + outputs.size() - outcount, names.data(),
+        add_output_impl(M, TM, outputs_start, names_start,
                         unopt_out ? unopt.data() + unopt.size() - 1 : nullptr,
                         opt_out ? opt.data() + opt.size() - 1 : nullptr,
                         obj_out ? obj.data() + obj.size() - 1 : nullptr,
@@ -1318,7 +1319,6 @@ static void add_output(Module &M, TargetMachine &TM, std::vector<std::string> &o
 
     output_timer.startTimer();
 
-    auto outstart = outputs.data() + outputs.size() - outcount * threads;
     auto unoptstart = unopt_out ? unopt.data() + unopt.size() - threads : nullptr;
     auto optstart = opt_out ? opt.data() + opt.size() - threads : nullptr;
     auto objstart = obj_out ? obj.data() + obj.size() - threads : nullptr;
@@ -1347,11 +1347,7 @@ static void add_output(Module &M, TargetMachine &TM, std::vector<std::string> &o
             dropUnusedDeclarations(*M);
             timers[i].deletion.stopTimer();
 
-            SmallVector<StringRef, 4> names(outcount);
-            for (unsigned j = 0; j < outcount; ++j)
-                names[j] = outputs[i * outcount + j];
-
-            add_output_impl(*M, TM, outstart + i * outcount, names.data(),
+            add_output_impl(*M, TM, outputs_start + i * outcount, names_start + i * outcount,
                             unoptstart ? unoptstart + i : nullptr,
                             optstart ? optstart + i : nullptr,
                             objstart ? objstart + i : nullptr,
@@ -1578,7 +1574,7 @@ void jl_dump_native_impl(void *native_code,
     // DO NOT DELETE, this is necessary to ensure memorybuffers
     // have a stable backing store for both their object files and
     // their names
-    outputs.reserve(threads * (!!unopt_bc_fname + !!bc_fname + !!obj_fname + !!asm_fname) * 2 + 2);
+    outputs.reserve((threads + 1) * (!!unopt_bc_fname + !!bc_fname + !!obj_fname + !!asm_fname) * 2);
 
     auto compile = [&](Module &M, StringRef name, unsigned threads) { add_output(
             M, *SourceTM, outputs, name,