Index: src/frames.cc |
diff --git a/src/frames.cc b/src/frames.cc |
index 40df12c437281bb6006c66af0e8a55871c14623d..2473b6691d38f0fd4deed18b586d49a30854fdbb 100644 |
--- a/src/frames.cc |
+++ b/src/frames.cc |
@@ -155,8 +155,8 @@ void StackFrameIterator::Reset() { |
ASSERT(fp_ != NULL); |
state.fp = fp_; |
state.sp = sp_; |
- state.pc_address = |
- reinterpret_cast<Address*>(StandardFrame::ComputePCAddress(fp_)); |
+ state.pc_address = OS::ResolveReturnAddressLocation( |
+ reinterpret_cast<Address*>(StandardFrame::ComputePCAddress(fp_))); |
type = StackFrame::ComputeType(isolate(), &state); |
} |
if (SingletonFor(type) == NULL) return; |
@@ -488,8 +488,8 @@ void ExitFrame::ComputeCallerState(State* state) const { |
// Set up the caller state. |
state->sp = caller_sp(); |
state->fp = Memory::Address_at(fp() + ExitFrameConstants::kCallerFPOffset); |
- state->pc_address |
- = reinterpret_cast<Address*>(fp() + ExitFrameConstants::kCallerPCOffset); |
+ state->pc_address = OS::ResolveReturnAddressLocation( |
+ reinterpret_cast<Address*>(fp() + ExitFrameConstants::kCallerPCOffset)); |
} |
@@ -523,7 +523,8 @@ StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) { |
void ExitFrame::FillState(Address fp, Address sp, State* state) { |
state->sp = sp; |
state->fp = fp; |
- state->pc_address = reinterpret_cast<Address*>(sp - 1 * kPointerSize); |
+ state->pc_address = OS::ResolveReturnAddressLocation( |
+ reinterpret_cast<Address*>(sp - 1 * kPointerSize)); |
} |
@@ -558,7 +559,8 @@ int StandardFrame::ComputeExpressionsCount() const { |
void StandardFrame::ComputeCallerState(State* state) const { |
state->sp = caller_sp(); |
state->fp = caller_fp(); |
- state->pc_address = reinterpret_cast<Address*>(ComputePCAddress(fp())); |
+ state->pc_address = OS::ResolveReturnAddressLocation( |
+ reinterpret_cast<Address*>(ComputePCAddress(fp()))); |
} |