Deleted old code. Small cleanup

Author: adam-yang

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

@@ -45,8 +45,7 @@ template <typename T> T Take(Expected<T> ExpectedResult, const Twine &Msg) {
   return ret;
 }
 
-struct ScopePrinterMk2 {
-
+struct ScopePrinter {
   std::vector<const LVLine *> Lines;
   std::unordered_map<LVAddress, std::vector<const LVLocation *>> LivetimeBegins;
   std::unordered_map<LVAddress, std::vector<const LVLocation *>>
@@ -95,7 +94,7 @@ struct ScopePrinterMk2 {
     }
   }
 
-  ScopePrinterMk2(raw_ostream &OS, const LVScopeFunction *Fn) : OS(OS) {
+  ScopePrinter(raw_ostream &OS, const LVScopeFunction *Fn) : OS(OS) {
     Walk(OS, Fn);
     std::sort(Lines.begin(), Lines.end(),
               [](const LVLine *a, const LVLine *b) -> bool {
@@ -105,14 +104,11 @@ struct ScopePrinterMk2 {
                   return a->getIsLineDebug();
                 return a->getID() < b->getID();
               });
-
-    //DumpAllInlineFunctionLevels(Fn);
   }
 
-
-  static void PrintIndent(int Indent) {
+  static void PrintIndent(raw_ostream &OS, int Indent) {
     for (int i = 0; i < Indent; i++)
-      outs() << "  ";
+      OS << "  ";
   }
 
   static void PrintCallstack(raw_ostream& OS, const LVScope* Scope) {
@@ -132,25 +128,6 @@ struct ScopePrinterMk2 {
     }
   }
 
-  void DumpAllInlineFunctionLevels(const LVScope *Scope) {
-    if (Scope->getIsInlinedFunction()) {
-      outs() << Scope->getName() << " ID:" << Scope->getID();
-      if (Scope->rangeCount()) {
-        for (auto R : *Scope->getRanges()) {
-          auto Lo = Scope->getRanges()->front()->getLowerAddress();
-          auto Hi = Scope->getRanges()->front()->getUpperAddress();
-          outs() << " [" << hexValue(Lo) << ":"
-                 << hexValue(Hi) << "]";
-        }
-      }
-
-      outs() << ", level: " << Scope->getLevel() << "\n";
-    }
-    if (Scope->scopeCount())
-      for (auto S : *Scope->getScopes())
-        DumpAllInlineFunctionLevels(S);
-  }
-
   static bool IsChildScopeOf(const LVScope *A, const LVScope *B) {
     while (A) {
       A = A->getParentScope();
@@ -194,7 +171,7 @@ struct ScopePrinterMk2 {
               auto LineScope = LineDebug->getParentScope();
               if (SymScope != LineScope && !IsChildScopeOf(LineScope, SymScope))
                 continue;
-              PrintIndent(1);
+              PrintIndent(OS, 1);
               OS << "VAR: " << Sym->getName() << ": "
                      << Sym->getType()->getName()
                      << " : ";
@@ -215,182 +192,6 @@ struct ScopePrinterMk2 {
   }
 };
 
-struct ScopePrinter {
-  unsigned NumScopesPrinted = 0;
-  std::unordered_map<LVAddress, std::vector<const LVLocation *>> LivetimeBegins;
-  std::unordered_map<LVAddress, std::vector<const LVLocation *>>
-      LivetimeEndsInclusive;
-  SetVector<const LVLocation *> LiveSymbols; // This needs to be ordered since we're iterating over it.
-  std::unordered_set<const LVScope *> SeenScopes;
-
-  static void PrintIndent(int Indent) {
-    for (int i = 0; i < Indent; i++)
-      outs() << "  ";
-  };
-
-  void PrintScope(const LVScope *Scope, int Indent) {
-    NumScopesPrinted++;
-    SeenScopes.insert(Scope);
-
-    bool IsInlined = false;
-    if (Scope->getIsInlinedFunction()) {
-      Indent++;
-      auto InlinedFn = cast<LVScopeFunctionInlined>(Scope);
-      IsInlined = true;
-      PrintIndent(Indent);
-      outs() << "INLINED_FUNCTION: " << InlinedFn->getName() << "\n";
-    }
-
-    if (const LVSymbols *Symbols = Scope->getSymbols()) {
-      for (const LVSymbol *Symbol : *Symbols) {
-        LVLocations SymbolLocations;
-        Symbol->getLocations(SymbolLocations);
-        for (const LVLocation *Loc : SymbolLocations) {
-          if (Loc->getIsGapEntry())
-            continue;
-
-          LVAddress Begin = Loc->getLowerAddress();
-          LVAddress End = Loc->getUpperAddress();
-          LivetimeBegins[Begin].push_back(Loc);
-          LivetimeEndsInclusive[End].push_back(Loc);
-          if (IncludeRanges) {
-            outs() << "RANGE: " << Symbol->getName() << ": ["
-                   << hexValue(Begin) << ":" << hexValue(End) << "]\n";
-          }
-        }
-      }
-    }
-
-    auto Lines = Scope->getLines();
-    if (Lines) {
-      int LastLine = -1;
-      StringRef LastFilename;
-      for (const LVLine *Line : *Lines) {
-
-        if (auto Scopes = Scope->getScopes()) {
-          for (const LVScope *SubScope : *Scopes) {
-            if (SeenScopes.count(SubScope))
-              continue;
-#if 0
-            if (SubScope->getBaseAddress() < Line->getAddress()) {
-              PrintScope(SubScope, Indent);
-            }
-#else
-
-
-            struct Local {
-              static LVAddress GetBaseAddress(const LVScope *S) {
-                if (S->rangeCount()) {
-                  return S->getRanges()->front()->getLowerAddress();
-                }
-                if (S->lineCount()) {
-                  return S->getLines()->front()->getAddress();
-                }
-                if (S->scopeCount()) {
-                  for (LVScope *SubS : *S->getScopes()) {
-                    LVAddress A = GetBaseAddress(SubS);
-                    if (A != -1)
-                      return A;
-                  }
-                }
-                return -1;
-              };
-            };
-#if 0
-            auto ScopeLines = SubScope->getLines();
-            if (ScopeLines && ScopeLines->size() &&
-                ScopeLines->front()->getAddress() < Line->getAddress()) {
-              PrintScope(SubScope, Indent);
-            } else {
-              outs() << "";
-            }
-#else
-            unsigned BaseAdress = Local::GetBaseAddress(SubScope);
-            if (BaseAdress < Line->getAddress()) {
-              PrintScope(SubScope, Indent);
-            }
-#endif
-#endif
-          }
-        }
-
-        // Update live list: Add lives
-        for (auto Loc : LivetimeBegins[Line->getAddress()])
-          LiveSymbols.insert(Loc);
-
-        if (Line->getIsLineDebug() && Line->getLineNumber() != 0) {
-          auto LineDebug = cast<LVLineDebug>(Line);
-          if (LineDebug->getLineNumber() == 605)
-            outs() << "";
-          if (LastLine != LineDebug->getLineNumber() ||
-              LineDebug->getPathname() != LastFilename) {
-            PrintIndent(Indent+1);
-            outs() << "LINE: " << " ["
-                   << hexValue(LineDebug->getAddress()) << "] "
-                   << LineDebug->getPathname() << ":"
-                   << LineDebug->getLineNumber() << "\n";
-
-            if (IncludeVars) {
-              for (auto SymLoc : LiveSymbols) {
-                PrintIndent(Indent+2);
-                const LVSymbol *Sym = SymLoc->getParentSymbol();
-                outs() << "VAR: " << Sym->getName() << ": "
-                       << Sym->getType()->getName()
-                       << " : ";
-                SymLoc->printLocations(outs());
-                outs() << "\n";
-              }
-            }
-          }
-          LastLine = LineDebug->getLineNumber();
-          LastFilename = LineDebug->getPathname();
-        } else if (Line->getIsLineAssembler()) {
-          if (IncludeCode)
-            outs() << "  CODE: " << " [" << hexValue(Line->getAddress())
-                   << "]  " << Line->getName() << "\n";
-        }
-
-        // Update live list: remove dead
-        for (auto Loc : LivetimeEndsInclusive[Line->getAddress()])
-          LiveSymbols.remove(Loc);
-      }
-    } else if (Scope->scopeCount()) {
-      for (auto SubS : *Scope->getScopes()) {
-        PrintScope(SubS, Indent);
-      }
-    }
-
-    if (IsInlined) {
-      PrintIndent(Indent);
-      outs() << "END_INLINED_FUNCTION\n";
-      Indent--;
-    }
-  }
-
-  static unsigned CountScopes(const LVScope *Scope) {
-    unsigned Count = 0;
-    auto Scopes = Scope->getScopes();
-    if (Scopes) {
-      for (auto S : *Scopes)
-        Count += CountScopes(S);
-    }
-    return Count + 1;
-  }
-
-  std::vector<const LVScope *> UnseenScopes;
-  void CollectUnsceenScopes(const LVScope *Scope) {
-    if (!SeenScopes.count(Scope)) {
-      UnseenScopes.push_back(Scope);
-      Scope->dump();
-    }
-    if (Scope->scopeCount()) {
-      for (auto S : *Scope->getScopes())
-        CollectUnsceenScopes(S);
-    }
-  }
-
-};
-
 int main(int argc, char *argv[]) {
   InitLLVM X(argc, argv);
 
@@ -428,28 +229,8 @@ int main(int argc, char *argv[]) {
         continue;
       outs() << "FUNCTION: " << Child->getName() << "\n";
 
-#if 0
-      ScopePrinter P;
-      P.PrintScope(Fn, 0);
-
-      P.CollectUnsceenScopes(Fn);
-
-      for (auto S : P.UnseenScopes) {
-        if (S->symbolCount()) {
-          for (auto Sym : *S->getSymbols())
-            outs() << Sym->getName() << ": " << Sym->getTypeName() << " (line"
-                   << Sym->getLineNumber() << ")" << "\n";
-        }
-      }
-
-      //unsigned NumScopes = ScopePrinter::CountScopes(Fn);
-
-      outs() << "";
-#else
-      ScopePrinterMk2 P(outs(), Fn);
+      ScopePrinter P(outs(), Fn);
       P.Print();
-#endif
-
     }
   }