| Index: runtime/vm/debugger.cc
|
| diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
|
| index 6b50583c2c8ced0fb091c69788705bccde454aa5..155512ad4fd4b1c7e5e849f3baa3cfaaa4033002 100644
|
| --- a/runtime/vm/debugger.cc
|
| +++ b/runtime/vm/debugger.cc
|
| @@ -519,7 +519,7 @@ TokenPosition ActivationFrame::TokenPos() {
|
| token_pos_ = TokenPosition::kNoSource;
|
| GetPcDescriptors();
|
| PcDescriptors::Iterator iter(pc_desc_, RawPcDescriptors::kAnyKind);
|
| - uword pc_offset = pc_ - code().EntryPoint();
|
| + uword pc_offset = pc_ - code().PayloadStart();
|
| while (iter.MoveNext()) {
|
| if (iter.PcOffset() == pc_offset) {
|
| try_index_ = iter.TryIndex();
|
| @@ -1528,7 +1528,7 @@ DebuggerStackTrace* Debugger::StackTraceFrom(const Stacktrace& ex_trace) {
|
| if (!function.IsNull() && function.is_visible()) {
|
| code = ex_trace.CodeAtFrame(i);
|
| ASSERT(function.raw() == code.function());
|
| - uword pc = code.EntryPoint() + Smi::Value(ex_trace.PcOffsetAtFrame(i));
|
| + uword pc = code.PayloadStart() + Smi::Value(ex_trace.PcOffsetAtFrame(i));
|
| if (code.is_optimized() && ex_trace.expand_inlined()) {
|
| // Traverse inlined frames.
|
| for (InlinedFunctionsIterator it(code, pc); !it.Done(); it.Advance()) {
|
| @@ -1537,8 +1537,8 @@ DebuggerStackTrace* Debugger::StackTraceFrom(const Stacktrace& ex_trace) {
|
| ASSERT(function.raw() == code.function());
|
| uword pc = it.pc();
|
| ASSERT(pc != 0);
|
| - ASSERT(code.EntryPoint() <= pc);
|
| - ASSERT(pc < (code.EntryPoint() + code.Size()));
|
| + ASSERT(code.PayloadStart() <= pc);
|
| + ASSERT(pc < (code.PayloadStart() + code.Size()));
|
|
|
| ActivationFrame* activation = new ActivationFrame(
|
| pc, fp, sp, code, deopt_frame, deopt_frame_offset);
|
| @@ -1828,7 +1828,7 @@ void Debugger::MakeCodeBreakpointAt(const Function& func,
|
| if (lowest_pc_offset == kUwordMax) {
|
| return;
|
| }
|
| - uword lowest_pc = code.EntryPoint() + lowest_pc_offset;
|
| + uword lowest_pc = code.PayloadStart() + lowest_pc_offset;
|
| CodeBreakpoint* code_bpt = GetCodeBreakpoint(lowest_pc);
|
| if (code_bpt == NULL) {
|
| // No code breakpoint for this code exists; create one.
|
|
|