CbC/CbC_llvm: llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp comparison

comparison llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp @ 236:c4bab56944e8 llvm-original

LLVM 16

author	kono
date	Wed, 09 Nov 2022 17:45:10 +0900
parents	79ff65ed7e25
children	1f2b6ac9f198

comparison

equal deleted inserted replaced

-:70dce7da266c
+:c4bab56944e8
 #include <thread>
 #include <unordered_set>
 #include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ThreadPool.h"
 #include "llvm/Support/raw_ostream.h"
 if (!CUI.LineTable->lookupAddressRange(SecAddress, RangeSize, RowVector)) {
 // If we have a DW_TAG_subprogram but no line entries, fall back to using
 // the DW_AT_decl_file an d DW_AT_decl_line if we have both attributes.
-if (auto FileIdx =
+std::string FilePath = Die.getDeclFile(
-dwarf::toUnsigned(Die.findRecursively({dwarf::DW_AT_decl_file}))) {
+DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
-if (auto Line =
+if (FilePath.empty())
-dwarf::toUnsigned(Die.findRecursively({dwarf::DW_AT_decl_line}))) {
+return;
-LineEntry LE(StartAddress, CUI.DWARFToGSYMFileIndex(Gsym, *FileIdx),
+if (auto Line =
-*Line);
+dwarf::toUnsigned(Die.findRecursively({dwarf::DW_AT_decl_line}))) {
-FI.OptLineTable = LineTable();
+LineEntry LE(StartAddress, Gsym.insertFile(FilePath), *Line);
-FI.OptLineTable->push(LE);
+FI.OptLineTable = LineTable();
-// LE.Addr = EndAddress;
+FI.OptLineTable->push(LE);
-// FI.OptLineTable->push(LE);
-}
 }
 return;
 }
 FI.OptLineTable = LineTable();
 // we will get a RowIndex for the previous valid line table row which won't
 // be contained in our function. This is usually a bug in the DWARF due to
 // linker problems or LTO or other DWARF re-linking so it is worth emitting
 // an error, but not worth stopping the creation of the GSYM.
 if (!FI.Range.contains(RowAddress)) {
-if (RowAddress < FI.Range.Start) {
+if (RowAddress < FI.Range.start()) {
 Log << "error: DIE has a start address whose LowPC is between the "
 "line table Row[" << RowIndex << "] with address "
 << HEX64(RowAddress) << " and the next one.\n";
 Die.dump(Log, 0, DIDumpOptions::getForSingleDIE());
-RowAddress = FI.Range.Start;
+RowAddress = FI.Range.start();
 } else {
 continue;
 }
 }
 // and the debug info wasn't able to be stripped from the DWARF. If
 // the LowPC isn't zero or -1, then we should emit an error.
 if (Range.LowPC != 0) {
 if (!Gsym.isQuiet()) {
 // Unexpected invalid address, emit a warning
-Log << "warning: DIE has an address range whose start address is "
+OS << "warning: DIE has an address range whose start address is "
 "not in any executable sections ("
 << *Gsym.GetValidTextRanges()
 << ") and will not be processed:\n";
-Die.dump(Log, 0, DIDumpOptions::getForSingleDIE());
+Die.dump(OS, 0, DIDumpOptions::getForSingleDIE());
 }
 }
 break;
 }
 FunctionInfo FI;
-FI.setStartAddress(Range.LowPC);
+FI.Range = {Range.LowPC, Range.HighPC};
-FI.setEndAddress(Range.HighPC);
 FI.Name = *NameIndex;
 if (CUI.LineTable) {
 convertFunctionLineTable(OS, CUI, Die, Gsym, FI);
 }
 if (hasInlineInfo(Die, 0)) {
 handleDie(OS, CUI, ChildDie);
 }
 Error DwarfTransformer::convert(uint32_t NumThreads) {
 size_t NumBefore = Gsym.getNumFunctionInfos();
+auto getDie = [&](DWARFUnit &DwarfUnit) -> DWARFDie {
+DWARFDie ReturnDie = DwarfUnit.getUnitDIE(false);
+if (llvm::Optional<uint64_t> DWOId = DwarfUnit.getDWOId()) {
+DWARFUnit *DWOCU = DwarfUnit.getNonSkeletonUnitDIE(false).getDwarfUnit();
+if (!DWOCU->isDWOUnit()) {
+std::string DWOName = dwarf::toString(
+DwarfUnit.getUnitDIE().find(
+{dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name}),
+"");
+Log << "warning: Unable to retrieve DWO .debug_info section for "
+<< DWOName << "\n";
+} else {
+ReturnDie = DWOCU->getUnitDIE(false);
+}
+}
+return ReturnDie;
+};
 if (NumThreads == 1) {
 // Parse all DWARF data from this thread, use the same string/file table
 // for everything
 for (const auto &CU : DICtx.compile_units()) {
-DWARFDie Die = CU->getUnitDIE(false);
+DWARFDie Die = getDie(*CU);
 CUInfo CUI(DICtx, dyn_cast<DWARFCompileUnit>(CU.get()));
 handleDie(Log, CUI, Die);
 }
 } else {
 // LLVM Dwarf parser is not thread-safe and we need to parse all DWARF up
 pool.wait();
 // Now convert all DWARF to GSYM in a thread pool.
 std::mutex LogMutex;
 for (const auto &CU : DICtx.compile_units()) {
-DWARFDie Die = CU->getUnitDIE(false /*CUDieOnly*/);
+DWARFDie Die = getDie(*CU);
 if (Die) {
 CUInfo CUI(DICtx, dyn_cast<DWARFCompileUnit>(CU.get()));
 pool.async([this, CUI, &LogMutex, Die]() mutable {
 std::string ThreadLogStorage;
 raw_string_ostream ThreadOS(ThreadLogStorage);
 Log << "error: address " << HEX64(Addr) << " has "
 << NumDwarfInlineInfos << " DWARF inline frames and GSYM has "
 << LR->Locations.size() << "\n";
 Log << "    " << NumDwarfInlineInfos << " DWARF frames:\n";
 for (size_t Idx = 0; Idx < NumDwarfInlineInfos; ++Idx) {
-const auto dii = DwarfInlineInfos.getFrame(Idx);
+const auto &dii = DwarfInlineInfos.getFrame(Idx);
 Log << "    [" << Idx << "]: " << dii.FunctionName << " @ "
 << dii.FileName << ':' << dii.Line << '\n';
 }
 Log << "    " << LR->Locations.size() << " GSYM frames:\n";
 for (size_t Idx = 0, count = LR->Locations.size();
 for (size_t Idx = 0, count = LR->Locations.size(); Idx < count;
 ++Idx) {
 const auto &gii = LR->Locations[Idx];
 if (Idx < NumDwarfInlineInfos) {
-const auto dii = DwarfInlineInfos.getFrame(Idx);
+const auto &dii = DwarfInlineInfos.getFrame(Idx);
 gsymFilename = LR->getSourceFile(Idx);
 // Verify function name
 if (dii.FunctionName.find(gii.Name.str()) != 0)
 Log << "error: address " << HEX64(Addr) << " DWARF function \""
 << dii.FunctionName.c_str()

Mercurial > hg > CbC > CbC_llvm

comparison llvm/lib/DebugInfo/GSYM/DwarfTransformer.cpp @ 236:c4bab56944e8 llvm-original