commit b76749d44c8d13ae76de6b53fe9e5394458fe830
author Régis Crelier <regis@google.com> Thu Aug 16 00:03:33 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Aug 16 00:03:33 2018 +0000
tree a431c1c5d1a19386aa52464ace9bb28cf99dc622
parent 90440ad2df7e9301be7775f73ae61028b2d8d38e

[VM runtime] Fix gc traversal of interpreted entry frame.

Change-Id: I9cb5e217bef49c882b6826db2f17b03a77adc345
Reviewed-on: https://dart-review.googlesource.com/70165
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Régis Crelier <regis@google.com>

runtime/vm/stack_frame.cc

diff --git a/runtime/vm/stack_frame.cc b/runtime/vm/stack_frame.cc
index 940b83c..0a6d92b 100644
--- a/runtime/vm/stack_frame.cc
+++ b/runtime/vm/stack_frame.cc
@@ -92,11 +92,15 @@
 }
 
 void ExitFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
-  // Visit pc marker and saved pool pointer.
-  RawObject** last_fixed =
-      reinterpret_cast<RawObject**>(fp()) + kFirstObjectSlotFromFp;
-  RawObject** first_fixed =
-      reinterpret_cast<RawObject**>(fp()) + kLastFixedObjectSlotFromFp;
+  ASSERT(visitor != NULL);
+  // Visit pc marker and saved pool pointer, or, for interpreted frame, code
+  // object and function object.
+  RawObject** last_fixed = reinterpret_cast<RawObject**>(fp()) +
+                           (is_interpreted() ? kKBCLastFixedObjectSlotFromFp
+                                             : kFirstObjectSlotFromFp);
+  RawObject** first_fixed = reinterpret_cast<RawObject**>(fp()) +
+                            (is_interpreted() ? kKBCFirstObjectSlotFromFp
+                                              : kLastFixedObjectSlotFromFp);
 #if !defined(TARGET_ARCH_DBC)
   ASSERT(first_fixed <= last_fixed);
   visitor->VisitPointers(first_fixed, last_fixed);
@@ -107,17 +111,22 @@
 }
 
 void EntryFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
-  // Visit objects between SP and (FP - callee_save_area).
   ASSERT(visitor != NULL);
+  // Visit objects between SP and (FP - callee_save_area).
 #if !defined(TARGET_ARCH_DBC)
-  RawObject** first = reinterpret_cast<RawObject**>(sp());
-  RawObject** last = reinterpret_cast<RawObject**>(
-      fp() + (kExitLinkSlotFromEntryFp - 1) * kWordSize);
+  RawObject** first = is_interpreted() ? reinterpret_cast<RawObject**>(fp()) +
+                                             kKBCSavedArgDescSlotFromEntryFp
+                                       : reinterpret_cast<RawObject**>(sp());
+  RawObject** last = is_interpreted() ? reinterpret_cast<RawObject**>(sp())
+                                      : reinterpret_cast<RawObject**>(fp()) +
+                                            kExitLinkSlotFromEntryFp - 1;
+  // There may not be any pointer to visit; in this case, first > last.
   visitor->VisitPointers(first, last);
 #else
   // On DBC stack is growing upwards which implies fp() <= sp().
   RawObject** first = reinterpret_cast<RawObject**>(fp());
   RawObject** last = reinterpret_cast<RawObject**>(sp());
+  ASSERT(first <= last);
   visitor->VisitPointers(first, last);
 #endif
 }