@@ -6540,30 +6540,30 @@ static void AddSegmentRegisterSections(Process &process, ThreadSP &thread_sp,
6540
6540
if (!reg_info)
6541
6541
return ;
6542
6542
6543
- lldb_private::RegisterValue reg_value ;
6544
- bool success = reg_ctx->ReadRegister (reg_info, reg_value );
6543
+ lldb_private::RegisterValue thread_local_register_value ;
6544
+ bool success = reg_ctx->ReadRegister (reg_info, thread_local_register_value );
6545
6545
if (!success)
6546
6546
return ;
6547
6547
6548
6548
const uint64_t fail_value = UINT64_MAX;
6549
6549
bool readSuccess = false ;
6550
6550
const lldb::addr_t reg_value_addr =
6551
- reg_value .GetAsUInt64 (fail_value, &readSuccess);
6551
+ thread_local_register_value .GetAsUInt64 (fail_value, &readSuccess);
6552
6552
if (!readSuccess || reg_value_addr == fail_value)
6553
6553
return ;
6554
6554
6555
- MemoryRegionInfo register_region ;
6556
- Status err = process.GetMemoryRegionInfo (reg_value_addr, register_region );
6555
+ MemoryRegionInfo thread_local_region ;
6556
+ Status err = process.GetMemoryRegionInfo (reg_value_addr, thread_local_region );
6557
6557
if (err.Fail ())
6558
6558
return ;
6559
6559
6560
6560
// We already saved off this truncated stack range.
6561
- if (register_region .GetRange ().GetRangeEnd () == range_end)
6561
+ if (thread_local_region .GetRange ().GetRangeEnd () == range_end)
6562
6562
return ;
6563
6563
6564
6564
// We don't need to worry about duplication because the CoreFileMemoryRanges
6565
6565
// will unique them
6566
- AddRegion (register_region , true , ranges);
6566
+ AddRegion (thread_local_region , true , ranges);
6567
6567
}
6568
6568
6569
6569
static void AddLinkMapSections (Process &process, CoreFileMemoryRanges &ranges) {
@@ -6582,12 +6582,12 @@ static void AddLinkMapSections(Process &process, CoreFileMemoryRanges &ranges) {
6582
6582
if (load_addr == LLDB_INVALID_ADDRESS)
6583
6583
continue ;
6584
6584
6585
- MemoryRegionInfo tls_storage_region ;
6586
- Status err = process.GetMemoryRegionInfo (load_addr, tls_storage_region );
6585
+ MemoryRegionInfo link_map_section ;
6586
+ Status err = process.GetMemoryRegionInfo (load_addr, link_map_section );
6587
6587
if (err.Fail ())
6588
6588
continue ;
6589
6589
6590
- AddRegion (tls_storage_region , true , ranges);
6590
+ AddRegion (link_map_section , true , ranges);
6591
6591
}
6592
6592
}
6593
6593
0 commit comments