Deleted test code. Formatting.

Author: adam-yang

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

@@ -83,7 +83,6 @@ 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/lib/DebugInfo/DWARF/DWARFFormValue.cpp

@@ -379,8 +379,6 @@ 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

@@ -673,16 +673,6 @@ void LVLocationSymbol::printExtra(raw_ostream &OS, bool Full) const {
     std::string Str;
     raw_string_ostream Stream(Str);
     printLocations(Stream);
-    #if 0
-    bool CodeViewLocation = getParentSymbol()->getHasCodeViewLocation();
-    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,9 +134,6 @@ 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,9 +733,6 @@ 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,8 +252,6 @@ 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)
@@ -463,16 +461,17 @@ LVScope *LVDWARFReader::processOneDie(const DWARFDie &InputDIE, LVScope *Parent,
         if (!CurrentRanges.empty()) {
           for (LVAddressRange &Range : CurrentRanges)
             addSectionRange(SectionIndex, CurrentScope, Range.first,
-                            Range.second > Range.first ? Range.second - 1
-                                                       : Range.second);
+                            Range.second > Range.first
+                                ? Range.second - 1 // Make hi-pc exclusive
+                                : 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 > CurrentLowPC
-                              ? CurrentHighPC - 1
-                              : CurrentHighPC); // Make hi-pc exclusive
+                              ? CurrentHighPC - 1 // Make hi-pc exclusive
+                              : CurrentHighPC);
         }
       }
     }

llvm/tools/llvm-debuginfo-check/llvm-debuginfo-check.cpp

@@ -11,17 +11,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/TargetSelect.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/DebugInfo/LogicalView/LVReaderHandler.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/ScopedPrinter.h"
-#include "llvm/DebugInfo/LogicalView/LVReaderHandler.h"
-#include "llvm/ADT/SetVector.h"
+#include "llvm/Support/TargetSelect.h"
 
 #include <string>
-#include <unordered_set>
 #include <unordered_map>
+#include <unordered_set>
 
 using namespace llvm;
 using namespace logicalview;
@@ -32,7 +32,8 @@ static cl::opt<std::string>
                   cl::Required);
 
 static cl::opt<bool> IncludeCode("code", cl::desc("Include asm"));
-static cl::opt<bool> IncludeRanges("ranges", cl::desc("Include variable ranges"));
+static cl::opt<bool> IncludeRanges("ranges",
+                                   cl::desc("Include variable ranges"));
 static cl::opt<bool> IncludeVars("vars", cl::desc("Include live variables"));
 
 template <typename T> T Take(Expected<T> ExpectedResult, const Twine &Msg) {
@@ -52,16 +53,14 @@ struct ScopePrinter {
       LivetimeEndsExclusive;
   raw_ostream &OS;
 
-  void Walk(raw_ostream &OS, const LVScope* Scope) {
+  void Walk(raw_ostream &OS, const LVScope *Scope) {
     if (Scope->scopeCount()) {
       for (const LVScope *ChildScope : *Scope->getScopes())
         Walk(OS, ChildScope);
     }
     if (Scope->lineCount()) {
       for (const LVLine *Line : *Scope->getLines()) {
         Lines.push_back(Line);
-        if (Line->getParentScope() != Scope)
-          OS << "";
       }
     }
     if (Scope->symbolCount()) {
@@ -72,7 +71,8 @@ struct ScopePrinter {
           continue;
 
         if (IncludeRanges) {
-          OS << "RANGES: " << Symbol->getName() << " (line " << Symbol->getLineNumber() << ")" << ": ";
+          OS << "RANGES: " << Symbol->getName() << " (line "
+             << Symbol->getLineNumber() << ")" << ": ";
         }
 
         for (const LVLocation *Loc : SymbolLocations) {
@@ -111,14 +111,15 @@ struct ScopePrinter {
       OS << "  ";
   }
 
-  static void PrintCallstack(raw_ostream& OS, const LVScope* Scope) {
+  static void PrintCallstack(raw_ostream &OS, const LVScope *Scope) {
     bool First = true;
     const LVScope *PrevScope = nullptr;
     while (Scope) {
       if (Scope->getIsFunction() || Scope->getIsInlinedFunction()) {
         OS << "[" << Scope->getName();
         if (PrevScope && PrevScope->getIsInlinedFunction()) {
-          OS << ":" << cast<LVScopeFunctionInlined>(PrevScope)->getCallLineNumber();
+          OS << ":"
+             << cast<LVScopeFunctionInlined>(PrevScope)->getCallLineNumber();
         }
         OS << "]";
         First = false;
@@ -138,7 +139,8 @@ struct ScopePrinter {
   }
 
   void Print() {
-    SetVector<const LVLocation *> LiveSymbols; // This needs to be ordered since we're iterating over it.
+    SetVector<const LVLocation *>
+        LiveSymbols; // This needs to be ordered since we're iterating over it.
     int LastLine = -1;
     StringRef LastFilename;
     for (const LVLine *Line : Lines) {
@@ -165,16 +167,13 @@ struct ScopePrinter {
           if (IncludeVars) {
             for (auto SymLoc : LiveSymbols) {
               const LVSymbol *Sym = SymLoc->getParentSymbol();
-              if (Sym->getName() == "InMRT1")
-                outs() << "";
               auto SymScope = Sym->getParentScope();
               auto LineScope = LineDebug->getParentScope();
               if (SymScope != LineScope && !IsChildScopeOf(LineScope, SymScope))
                 continue;
               PrintIndent(OS, 1);
               OS << "VAR: " << Sym->getName() << ": "
-                     << Sym->getType()->getName()
-                     << " : ";
+                 << Sym->getType()->getName() << " : ";
               SymLoc->printLocations(OS);
               OS << " (line " << Sym->getLineNumber() << ")";
               OS << "\n";
@@ -200,8 +199,8 @@ int main(int argc, char *argv[]) {
   llvm::InitializeAllTargetMCs();
   InitializeAllDisassemblers();
 
-  cl::ParseCommandLineOptions(argc, argv,
-                              "Check debug info correctness via annotations.\n");
+  cl::ParseCommandLineOptions(
+      argc, argv, "Check debug info correctness via annotations.\n");
 
   ScopedPrinter W(llvm::outs());
   LVOptions Options;
@@ -213,8 +212,8 @@ int main(int argc, char *argv[]) {
   std::vector<std::string> Objects;
   LVReaderHandler Handler(Objects, W, Options);
   auto Readers = Take(Handler.createReader(InputFilename),
-       Twine("Failed to create LV reader from '") + Twine(InputFilename) +
-           Twine("'"));
+                      Twine("Failed to create LV reader from '") +
+                          Twine(InputFilename) + Twine("'"));
 
   auto *CU = Readers->getCompileUnit();
   if (!CU)
@@ -228,7 +227,7 @@ int main(int argc, char *argv[]) {
       if (!Lines)
         continue;
       outs() << "FUNCTION: " << Child->getName() << "\n";
- 
+
       ScopePrinter P(outs(), Fn);
       P.Print();
     }