@@ -1176,8 +1176,7 @@ void SwiftLanguageRuntime::FindFunctionPointersInCall(
1176
1176
if (target_context.symbol )
1177
1177
fn_ptr_address = target_context.symbol ->GetAddress ();
1178
1178
else if (target_context.function )
1179
- fn_ptr_address =
1180
- target_context.function ->GetAddressRange ().GetBaseAddress ();
1179
+ fn_ptr_address = target_context.function ->GetAddress ();
1181
1180
}
1182
1181
}
1183
1182
}
@@ -2688,9 +2687,11 @@ DoesContinuationPointToSameFunction(addr_t async_reg, SymbolContext &sc,
2688
2687
Address continuation_addr;
2689
2688
continuation_addr.SetLoadAddress (process.FixCodeAddress (*continuation_ptr),
2690
2689
&process.GetTarget ());
2691
- if (sc.function )
2692
- return sc.function ->GetAddressRange ().ContainsLoadAddress (
2693
- continuation_addr, &process.GetTarget ());
2690
+ if (sc.function ) {
2691
+ AddressRange unused_range;
2692
+ return sc.function ->GetRangeContainingLoadAddress (
2693
+ continuation_addr.GetOffset (), process.GetTarget (), unused_range);
2694
+ }
2694
2695
assert (sc.symbol );
2695
2696
return sc.symbol ->ContainsFileAddress (continuation_addr.GetFileAddress ());
2696
2697
}
@@ -2724,8 +2725,7 @@ static llvm::Expected<bool> IsIndirectContext(Process &process,
2724
2725
uint32_t prologue_size = sc.function ? sc.function ->GetPrologueByteSize ()
2725
2726
: sc.symbol ->GetPrologueByteSize ();
2726
2727
Address func_start_addr =
2727
- sc.function ? sc.function ->GetAddressRange ().GetBaseAddress ()
2728
- : sc.symbol ->GetAddress ();
2728
+ sc.function ? sc.function ->GetAddress () : sc.symbol ->GetAddress ();
2729
2729
// Include one instruction after the prologue. This is where breakpoints
2730
2730
// by function name are set, so it's important to get this point right. This
2731
2731
// instruction is exactly at address "base + prologue", so adding 1
@@ -2776,7 +2776,7 @@ SwiftLanguageRuntime::GetRuntimeUnwindPlan(ProcessSP process_sp,
2776
2776
Address func_start_addr;
2777
2777
ConstString mangled_name;
2778
2778
if (sc.function ) {
2779
- func_start_addr = sc.function ->GetAddressRange (). GetBaseAddress ();
2779
+ func_start_addr = sc.function ->GetAddress ();
2780
2780
mangled_name = sc.function ->GetMangled ().GetMangledName ();
2781
2781
} else if (sc.symbol ) {
2782
2782
func_start_addr = sc.symbol ->GetAddress ();
0 commit comments