Addressed some more feedback

Author: adam-yang

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

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/SetVector.h"
 #include "llvm/DebugInfo/LogicalView/Core/LVReader.h"
+#include "llvm/ADT/SetVector.h"
 #include "llvm/DebugInfo/LogicalView/Core/LVScope.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FormatAdapters.h"
@@ -531,9 +531,9 @@ namespace {
 
 struct DebuggerViewPrinter {
   std::vector<const LVLine *> Lines;
-  std::unordered_map<LVAddress, std::vector<const LVLocation *>> LivetimeBegins;
+  std::unordered_map<LVAddress, std::vector<const LVLocation *>> LifetimeBegins;
   std::unordered_map<LVAddress, std::vector<const LVLocation *>>
-      LivetimeEndsExclusive;
+      LifetimeEndsExclusive;
   raw_ostream &OS;
 
   const bool IncludeRanges = false;
@@ -566,8 +566,9 @@ struct DebuggerViewPrinter {
 
           LVAddress Begin = Loc->getLowerAddress();
           LVAddress End = Loc->getUpperAddress();
-          LivetimeBegins[Begin].push_back(Loc);
-          LivetimeEndsExclusive[End].push_back(Loc);
+          LifetimeBegins[Begin].push_back(Loc);
+          LifetimeEndsExclusive[End].push_back(Loc);
+
           if (IncludeRanges) {
             OS << "[" << hexValue(Begin) << ":" << hexValue(End) << "] ";
           }
@@ -629,10 +630,10 @@ struct DebuggerViewPrinter {
     for (const LVLine *Line : Lines) {
       const LVScope *Scope = Line->getParentScope();
       // Update live list: Add lives
-      for (auto Loc : LivetimeBegins[Line->getAddress()])
+      for (auto Loc : LifetimeBegins[Line->getAddress()])
         LiveSymbols.insert(Loc);
       // Update live list: remove dead
-      for (auto Loc : LivetimeEndsExclusive[Line->getAddress()])
+      for (auto Loc : LifetimeEndsExclusive[Line->getAddress()])
         LiveSymbols.remove(Loc);
 
       if (Line->getIsNewStatement() && Line->getIsLineDebug() &&
@@ -653,8 +654,8 @@ struct DebuggerViewPrinter {
             if (SymScope != LineScope && !IsChildScopeOf(LineScope, SymScope))
               continue;
             PrintIndent(OS, 2);
-            OS << "{Variable}: " << Sym->getName() << ": " << Sym->getType()->getName()
-               << " : ";
+            OS << "{Variable}: " << Sym->getName() << ": "
+               << Sym->getType()->getName() << " : ";
             SymLoc->printLocations(OS);
             OS << " (line " << Sym->getLineNumber() << ")";
             OS << "\n";
@@ -674,7 +675,8 @@ struct DebuggerViewPrinter {
 Error LVReader::printDebugger() {
   auto *CU = getCompileUnit();
   if (!CU) {
-    return createStringError(std::make_error_code(std::errc::invalid_argument), "Error: No compute unit found.");
+    return createStringError(std::make_error_code(std::errc::invalid_argument),
+                             "Error: No compute unit found.");
   }
 
   for (LVElement *Child : *CU->getChildren()) {

llvm/test/CodeGen/AMDGPU/amdgpu-debuginfo-check.ll

@@ -1,8 +1,8 @@
 ; RUN: llc %s -o %t.o -mcpu=gfx1030 -filetype=obj -O0
 ; RUN: llvm-debuginfo-analyzer --report=debugger --print=symbols %t.o | FileCheck %s
 
-; This test compiles this module with AMDGPU backend under -O0,
-; and makes sure llvm-debuginfo-analyzer --report=debugger works for it.
+; The test compiles this module using the AMDGPU backend under `-O0`,
+; and makes sure `llvm-debuginfo-analyzer --report=debugger` works for it.
 
 ; CHECK: {Function}: main
 ; CHECK: {Line}: {{.+}}basic_var.hlsl:7