[Lldb-commits] [lldb] r367861 - Revert "Changing representation of .cv_def_range directives in Codeview debug info assembly format for better readability"

[Nilanjana Basu via lldb-commits]

Author: nilanjana_basu
Date: Mon Aug  5 06:55:21 2019
New Revision: 367861

URL: http://llvm.org/viewvc/llvm-project?rev=367861&view=rev
Log:
Revert "Changing representation of .cv_def_range directives in Codeview debug info assembly format for better readability"

This reverts commit a885afa9fa8cab3b34f1ddf3d21535f88b662881.

Modified:
    lldb/trunk/lit/SymbolFile/NativePDB/Inputs/s_constant.s
    lldb/trunk/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp

Modified: lldb/trunk/lit/SymbolFile/NativePDB/Inputs/s_constant.s
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/NativePDB/Inputs/s_constant.s?rev=367861&r1=367860&r2=367861&view=diff
==============================================================================
--- lldb/trunk/lit/SymbolFile/NativePDB/Inputs/s_constant.s (original)
+++ lldb/trunk/lit/SymbolFile/NativePDB/Inputs/s_constant.s Mon Aug  5 06:55:21 2019
@@ -165,7 +165,7 @@ GlobalSSEC:
 	.short	1                       # Flags
 	.asciz	"argc"
 .Ltmp13:
-	.cv_def_range	 .Ltmp0 .Ltmp1, frame_ptr_rel, 4
+	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\004\000\000\000"
 	.short	.Ltmp15-.Ltmp14         # Record length
 .Ltmp14:
 	.short	4414                    # Record kind: S_LOCAL
@@ -173,7 +173,7 @@ GlobalSSEC:
 	.short	1                       # Flags
 	.asciz	"argv"
 .Ltmp15:
-	.cv_def_range	 .Ltmp0 .Ltmp1, frame_ptr_rel, 8
+	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\b\000\000\000"
 	.short	2                       # Record length
 	.short	4431                    # Record kind: S_PROC_ID_END
 .Ltmp7:

Modified: lldb/trunk/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp?rev=367861&r1=367860&r2=367861&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp Mon Aug  5 06:55:21 2019
@@ -641,14 +641,14 @@ VariableInfo lldb_private::npdb::GetVari
         llvm::StringRef program;
         if (GetFrameDataProgram(index, ranges, program)) {
           result.location =
-              MakeVFrameRelLocationExpression(program, loc.Hdr.Offset, module);
+              MakeVFrameRelLocationExpression(program, loc.Offset, module);
           result.ranges = std::move(ranges);
         } else {
           // invalid variable
         }
       } else {
         result.location =
-            MakeRegRelLocationExpression(base_reg, loc.Hdr.Offset, module);
+            MakeRegRelLocationExpression(base_reg, loc.Offset, module);
         result.ranges = std::move(ranges);
       }
     } else if (loc_specifier_cvs.kind() == S_DEFRANGE_REGISTER_REL) {