Index: runtime/vm/stack_frame_arm64.h |
diff --git a/runtime/vm/stack_frame_arm64.h b/runtime/vm/stack_frame_arm64.h |
index f2528971a227e044eb4a634e21a03c02757c36cf..6733724c1c285fcfe50317dae4fe16eb0a4c192c 100644 |
--- a/runtime/vm/stack_frame_arm64.h |
+++ b/runtime/vm/stack_frame_arm64.h |
@@ -11,14 +11,14 @@ namespace dart { |
| | <- TOS |
Callee frame | ... | |
| saved PP | |
- | callee's PC marker | |
+ | code object | |
| saved FP | (FP of current frame) |
| saved PC | (PC of current frame) |
+--------------------+ |
Current frame | ... T| <- SP of current frame |
| first local T| |
| caller's PP T| |
- | PC marker | (current frame's code entry + offset) |
+ | code object T| (current frame's code object) |
| caller's FP | <- FP of current frame |
| caller's LR | (PC of caller frame) |
+--------------------+ |
@@ -31,7 +31,7 @@ Caller frame | last parameter | <- SP of caller frame |
static const int kDartFrameFixedSize = 4; // PP, FP, LR, PC marker. |
static const int kSavedPcSlotFromSp = -1; |
-static const int kFirstObjectSlotFromFp = -2; // Used by GC to traverse stack. |
+static const int kFirstObjectSlotFromFp = -1; // Used by GC to traverse stack. |
static const int kFirstLocalSlotFromFp = -3; |
static const int kSavedCallerPpSlotFromFp = -2; |
@@ -44,7 +44,7 @@ static const int kCallerSpSlotFromFp = 2; |
static const int kSavedAboveReturnAddress = 3; // Saved above return address. |
// Entry and exit frame layout. |
-static const int kExitLinkSlotFromEntryFp = -21; |
+static const int kExitLinkSlotFromEntryFp = -22; |
} // namespace dart |