@@ -326,12 +326,6 @@ static cl::opt<bool> KeepARanges(
326326 " keep or generate .debug_aranges section if .gdb_index is written" ),
327327 cl::Hidden, cl::cat(BoltCategory));
328328
329- static cl::opt<bool > DeterministicDebugInfo (
330- " deterministic-debuginfo" ,
331- cl::desc (" disables parallel execution of tasks that may produce "
332- " nondeterministic debug info" ),
333- cl::init(true ), cl::cat(BoltCategory));
334-
335329static cl::opt<std::string> DwarfOutputPath (
336330 " dwarf-output-path" ,
337331 cl::desc (" Path to where .dwo files or dwp file will be written out to." ),
@@ -607,11 +601,6 @@ void DWARFRewriter::updateDebugInfo() {
607601 StrWriter = std::make_unique<DebugStrWriter>(*BC.DwCtx , false );
608602 StrOffstsWriter = std::make_unique<DebugStrOffsetsWriter>(BC);
609603
610- if (!opts::DeterministicDebugInfo) {
611- opts::DeterministicDebugInfo = true ;
612- errs () << " BOLT-WARNING: --deterministic-debuginfo is being deprecated\n " ;
613- }
614-
615604 // / Stores and serializes information that will be put into the
616605 // / .debug_addr DWARF section.
617606 std::unique_ptr<DebugAddrWriter> FinalAddrWriter;
@@ -759,25 +748,13 @@ void DWARFRewriter::updateDebugInfo() {
759748 CUOffsetMap OffsetMap =
760749 finalizeTypeSections (DIEBlder, *Streamer, GDBIndexSection);
761750
762- const bool SingleThreadedMode =
763- opts::NoThreads || opts::DeterministicDebugInfo;
764- if (!SingleThreadedMode)
765- DIEBlder.buildCompileUnits ();
766- if (SingleThreadedMode) {
767- CUPartitionVector PartVec = partitionCUs (*BC.DwCtx );
768- for (std::vector<DWARFUnit *> &Vec : PartVec) {
769- DIEBlder.buildCompileUnits (Vec);
770- for (DWARFUnit *CU : DIEBlder.getProcessedCUs ())
771- processUnitDIE (CU, &DIEBlder);
772- finalizeCompileUnits (DIEBlder, *Streamer, OffsetMap,
773- DIEBlder.getProcessedCUs (), *FinalAddrWriter);
774- }
775- } else {
776- // Update unit debug info in parallel
777- ThreadPoolInterface &ThreadPool = ParallelUtilities::getThreadPool ();
778- for (std::unique_ptr<DWARFUnit> &CU : BC.DwCtx ->compile_units ())
779- ThreadPool.async (processUnitDIE, CU.get (), &DIEBlder);
780- ThreadPool.wait ();
751+ CUPartitionVector PartVec = partitionCUs (*BC.DwCtx );
752+ for (std::vector<DWARFUnit *> &Vec : PartVec) {
753+ DIEBlder.buildCompileUnits (Vec);
754+ for (DWARFUnit *CU : DIEBlder.getProcessedCUs ())
755+ processUnitDIE (CU, &DIEBlder);
756+ finalizeCompileUnits (DIEBlder, *Streamer, OffsetMap,
757+ DIEBlder.getProcessedCUs (), *FinalAddrWriter);
781758 }
782759
783760 DebugNamesTable.emitAccelTable ();
0 commit comments