Added new tool, and test code

Author: adam-yang

llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h

@@ -83,6 +83,7 @@ class DWARFFormValue {
 
   LLVM_ABI bool isFormClass(FormClass FC) const;
   const DWARFUnit *getUnit() const { return U; }
+  LLVM_DUMP_METHOD void dump() const;
   LLVM_ABI void dump(raw_ostream &OS,
                      DIDumpOptions DumpOpts = DIDumpOptions()) const;
   LLVM_ABI void dumpSectionedAddress(raw_ostream &OS, DIDumpOptions DumpOpts,

llvm/include/llvm/DebugInfo/LogicalView/Core/LVLocation.h

@@ -159,6 +159,7 @@ class LLVM_ABI LVLocation : public LVObject {
 
   void print(raw_ostream &OS, bool Full = true) const override;
   void printExtra(raw_ostream &OS, bool Full = true) const override;
+  virtual void printLocations(raw_ostream &OS) const {}
 };
 
 class LLVM_ABI LVLocationSymbol final : public LVLocation {
@@ -179,6 +180,7 @@ class LLVM_ABI LVLocationSymbol final : public LVLocation {
 
   void printRawExtra(raw_ostream &OS, bool Full = true) const override;
   void printExtra(raw_ostream &OS, bool Full = true) const override;
+  void printLocations(raw_ostream &OS) const override;
 };
 
 } // end namespace logicalview

llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp

@@ -379,6 +379,8 @@ void DWARFFormValue::dumpAddressSection(const DWARFObject &Obj, raw_ostream &OS,
     OS << format(" [%" PRIu64 "]", SectionIndex);
 }
 
+LLVM_DUMP_METHOD void DWARFFormValue::dump() const { dump(dbgs()); }
+
 void DWARFFormValue::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const {
   uint64_t UValue = Value.uval;
   bool CURelativeOffset = false;

llvm/lib/DebugInfo/LogicalView/Core/LVLocation.cpp

@@ -648,6 +648,19 @@ void LVLocation::print(LVLocations *Locations, raw_ostream &OS, bool Full) {
       Location->print(OS, Full);
 }
 
+void LVLocationSymbol::printLocations(raw_ostream &OS) const {
+  if (Entries) {
+    bool CodeViewLocation = getParentSymbol()->getHasCodeViewLocation();
+    std::string Leading;
+    for (LVOperation *Operation : *Entries) {
+      OS << Leading
+         << (CodeViewLocation ? Operation->getOperandsCodeViewInfo()
+                              : Operation->getOperandsDWARFInfo());
+      Leading = ", ";
+    }
+  }
+}
+
 void LVLocationSymbol::printExtra(raw_ostream &OS, bool Full) const {
   OS << "{Location}";
   if (getIsCallSite())
@@ -657,15 +670,19 @@ void LVLocationSymbol::printExtra(raw_ostream &OS, bool Full) const {
 
   // Print location entries.
   if (Full && Entries) {
+    std::string Str;
+    raw_string_ostream Stream(Str);
+    printLocations(Stream);
+    #if 0
     bool CodeViewLocation = getParentSymbol()->getHasCodeViewLocation();
-    std::stringstream Stream;
     std::string Leading;
     for (LVOperation *Operation : *Entries) {
       Stream << Leading
              << (CodeViewLocation ? Operation->getOperandsCodeViewInfo()
                                   : Operation->getOperandsDWARFInfo());
       Leading = ", ";
     }
+    #endif
     printAttributes(OS, Full, "{Entry} ", const_cast<LVLocationSymbol *>(this),
                     StringRef(Stream.str()),
                     /*UseQuotes=*/false,

llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp

@@ -134,6 +134,9 @@ void LVScope::addElement(LVLine *Line) {
   if (!Lines)
     Lines = std::make_unique<LVLines>();
 
+  if (Line->getAddress() == 0x2fc)
+  outs() << "Set Parent for line at addr: " << Line->getAddress()
+         << "\n ";
   // Add it to parent.
   Lines->push_back(Line);
   Line->setParent(this);

llvm/lib/DebugInfo/LogicalView/Readers/LVBinaryReader.cpp

@@ -733,6 +733,9 @@ void LVBinaryReader::processLines(LVLines *DebugLines,
   for (LVLine *Line : *DebugLines) {
     // Using the current line address, get its associated lexical scope and
     // add the line information to it.
+
+    if (Line->getAddress() == 0x2fc)
+      outs() << "";
     Scope = ScopesWithRanges->getEntry(Line->getAddress());
     if (!Scope) {
       // If missing scope, use the compile unit.

llvm/lib/DebugInfo/LogicalView/Readers/LVDWARFReader.cpp

@@ -252,6 +252,8 @@ void LVDWARFReader::processOneAttribute(const DWARFDie &Die,
 
   case dwarf::DW_AT_ranges:
     if (RangesDataAvailable && options().getGeneralCollectRanges()) {
+      if (CurrentScope->getID() == 2237)
+        outs() << "";
       auto GetRanges = [](const DWARFFormValue &FormValue,
                           DWARFUnit *U) -> Expected<DWARFAddressRangesVector> {
         if (FormValue.getForm() == dwarf::DW_FORM_rnglistx)
@@ -274,7 +276,7 @@ void LVDWARFReader::processOneAttribute(const DWARFDie &Die,
       for (DWARFAddressRange &Range : Ranges) {
         // This seems to be a tombstone for empty ranges.
         if ((Range.LowPC == Range.HighPC) ||
-            (Range.LowPC = getTombstoneAddress()))
+            (Range.LowPC == getTombstoneAddress()))
           continue;
         // Store the real upper limit for the address range.
         if (UpdateHighAddress && Range.HighPC > 0)
@@ -461,13 +463,16 @@ LVScope *LVDWARFReader::processOneDie(const DWARFDie &InputDIE, LVScope *Parent,
         if (!CurrentRanges.empty()) {
           for (LVAddressRange &Range : CurrentRanges)
             addSectionRange(SectionIndex, CurrentScope, Range.first,
-                            Range.second);
+                            Range.second > Range.first ? Range.second - 1
+                                                       : Range.second);
           CurrentRanges.clear();
         }
         // If the scope is the CU, do not update the ranges set.
         if (FoundLowPC && FoundHighPC && !IsCompileUnit) {
           addSectionRange(SectionIndex, CurrentScope, CurrentLowPC,
-                          CurrentHighPC);
+                          CurrentHighPC > CurrentLowPC
+                              ? CurrentHighPC - 1
+                              : CurrentHighPC); // Make hi-pc exclusive
         }
       }
     }

llvm/tools/llvm-debuginfo-check/CMakeLists.txt

@@ -0,0 +1,17 @@
+set(LLVM_LINK_COMPONENTS
+  AllTargetsDescs
+  AllTargetsDisassemblers
+  AllTargetsInfos
+  BinaryFormat
+  DebugInfoCodeView
+  DebugInfoLogicalView
+  DebugInfoPDB
+  MC
+  MCDisassembler
+  Object
+  Support
+  )
+
+add_llvm_tool(llvm-debuginfo-check
+  llvm-debuginfo-check.cpp
+  )