@@ -6540,30 +6540,30 @@ static void AddSegmentRegisterSections(Process &process, ThreadSP &thread_sp,
65406540 if (!reg_info)
65416541 return ;
65426542
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 );
65456545 if (!success)
65466546 return ;
65476547
65486548 const uint64_t fail_value = UINT64_MAX;
65496549 bool readSuccess = false ;
65506550 const lldb::addr_t reg_value_addr =
6551- reg_value .GetAsUInt64 (fail_value, &readSuccess);
6551+ thread_local_register_value .GetAsUInt64 (fail_value, &readSuccess);
65526552 if (!readSuccess || reg_value_addr == fail_value)
65536553 return ;
65546554
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 );
65576557 if (err.Fail ())
65586558 return ;
65596559
65606560 // 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)
65626562 return ;
65636563
65646564 // We don't need to worry about duplication because the CoreFileMemoryRanges
65656565 // will unique them
6566- AddRegion (register_region , true , ranges);
6566+ AddRegion (thread_local_region , true , ranges);
65676567}
65686568
65696569static void AddLinkMapSections (Process &process, CoreFileMemoryRanges &ranges) {
@@ -6582,12 +6582,12 @@ static void AddLinkMapSections(Process &process, CoreFileMemoryRanges &ranges) {
65826582 if (load_addr == LLDB_INVALID_ADDRESS)
65836583 continue ;
65846584
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 );
65876587 if (err.Fail ())
65886588 continue ;
65896589
6590- AddRegion (tls_storage_region , true , ranges);
6590+ AddRegion (link_map_section , true , ranges);
65916591 }
65926592}
65936593
0 commit comments