@@ -6551,30 +6551,30 @@ static void AddSegmentRegisterSections(Process &process, ThreadSP &thread_sp,
6551
6551
if (!reg_info)
6552
6552
return ;
6553
6553
6554
- lldb_private::RegisterValue reg_value ;
6555
- bool success = reg_ctx->ReadRegister (reg_info, reg_value );
6554
+ lldb_private::RegisterValue thread_local_register_value ;
6555
+ bool success = reg_ctx->ReadRegister (reg_info, thread_local_register_value );
6556
6556
if (!success)
6557
6557
return ;
6558
6558
6559
6559
const uint64_t fail_value = UINT64_MAX;
6560
6560
bool readSuccess = false ;
6561
6561
const lldb::addr_t reg_value_addr =
6562
- reg_value .GetAsUInt64 (fail_value, &readSuccess);
6562
+ thread_local_register_value .GetAsUInt64 (fail_value, &readSuccess);
6563
6563
if (!readSuccess || reg_value_addr == fail_value)
6564
6564
return ;
6565
6565
6566
- MemoryRegionInfo register_region ;
6567
- Status err = process.GetMemoryRegionInfo (reg_value_addr, register_region );
6566
+ MemoryRegionInfo thread_local_region ;
6567
+ Status err = process.GetMemoryRegionInfo (reg_value_addr, thread_local_region );
6568
6568
if (err.Fail ())
6569
6569
return ;
6570
6570
6571
6571
// We already saved off this truncated stack range.
6572
- if (register_region .GetRange ().GetRangeEnd () == range_end)
6572
+ if (thread_local_region .GetRange ().GetRangeEnd () == range_end)
6573
6573
return ;
6574
6574
6575
6575
// We don't need to worry about duplication because the CoreFileMemoryRanges
6576
6576
// will unique them
6577
- AddRegion (register_region , true , ranges);
6577
+ AddRegion (thread_local_region , true , ranges);
6578
6578
}
6579
6579
6580
6580
static void AddLinkMapSections (Process &process, CoreFileMemoryRanges &ranges) {
@@ -6593,12 +6593,12 @@ static void AddLinkMapSections(Process &process, CoreFileMemoryRanges &ranges) {
6593
6593
if (load_addr == LLDB_INVALID_ADDRESS)
6594
6594
continue ;
6595
6595
6596
- MemoryRegionInfo tls_storage_region ;
6597
- Status err = process.GetMemoryRegionInfo (load_addr, tls_storage_region );
6596
+ MemoryRegionInfo link_map_section ;
6597
+ Status err = process.GetMemoryRegionInfo (load_addr, link_map_section );
6598
6598
if (err.Fail ())
6599
6599
continue ;
6600
6600
6601
- AddRegion (tls_storage_region , true , ranges);
6601
+ AddRegion (link_map_section , true , ranges);
6602
6602
}
6603
6603
}
6604
6604
0 commit comments