Pass Thread into StackFrameIterator

runtime/vm/stack_frame.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/stack_frame.h"
 
 #include "platform/memory_sanitizer.h"
 #include "vm/assembler.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
@@ skipping 17 matching lines @@
   NoSafepointScope no_safepoint;
 #endif
   RawCode* code = GetCodeObject();
   intptr_t cid = code->ptr()->owner_->GetClassId();
   ASSERT(cid == kNullCid || cid == kClassCid || cid == kFunctionCid);
   return cid == kNullCid || cid == kClassCid;
 }
 
 
 const char* StackFrame::ToCString() const {
-  ASSERT(isolate_ == Isolate::Current());
+  ASSERT(thread_ == Thread::Current());
   Zone* zone = Thread::Current()->zone();
   if (IsDartFrame()) {
     const Code& code = Code::Handle(LookupDartCode());
     ASSERT(!code.IsNull());
     const Object& owner = Object::Handle(code.owner());
     ASSERT(!owner.IsNull());
     if (owner.IsFunction()) {
       const Function& function = Function::Cast(owner);
       return zone->PrintToString(
           "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ") %s ]",
@@ skipping 12 matching lines @@
   }
 }
 
 
 void ExitFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   // There are no objects to visit in this frame.
 }
 
 
 void EntryFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
-  ASSERT(isolate() == Isolate::Current());
+  ASSERT(thread() == Thread::Current());
   // Visit objects between SP and (FP - callee_save_area).
   ASSERT(visitor != NULL);
   RawObject** first = reinterpret_cast<RawObject**>(sp());
   RawObject** last = reinterpret_cast<RawObject**>(
       fp() + (kExitLinkSlotFromEntryFp - 1) * kWordSize);
   visitor->VisitPointers(first, last);
 }
 
 
 void StackFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   // NOTE: This code runs while GC is in progress and runs within
   // a NoHandleScope block. Hence it is not ok to use regular Zone or
   // Scope handles. We use direct stack handles, the raw pointers in
   // these handles are not traversed. The use of handles is mainly to
   // be able to reuse the handle based code and avoid having to add
   // helper functions to the raw object interface.
-  ASSERT(isolate_ == Isolate::Current());
+  ASSERT(thread() == Thread::Current());
   ASSERT(visitor != NULL);
   NoSafepointScope no_safepoint;
   Code code;
   code = LookupDartCode();
   if (!code.IsNull()) {
     // Visit the code object.
     RawObject* raw_code = code.raw();
     visitor->VisitPointer(&raw_code);
 
     // Optimized frames have a stack map. We need to visit the frame based
@@ skipping 59 matching lines @@
   // For normal unoptimized Dart frames and Stub frames each slot
   // between the first and last included are tagged objects.
   RawObject** first = reinterpret_cast<RawObject**>(sp());
   RawObject** last = reinterpret_cast<RawObject**>(
       fp() + (kFirstObjectSlotFromFp * kWordSize));
   visitor->VisitPointers(first, last);
 }
 
 
 RawFunction* StackFrame::LookupDartFunction() const {
-  ASSERT(isolate_ == Isolate::Current());
   const Code& code = Code::Handle(LookupDartCode());
   if (!code.IsNull()) {
     return code.function();
   }
   return Function::null();
 }
 
 
 RawCode* StackFrame::LookupDartCode() const {
-  ASSERT(isolate_ == Isolate::Current());
   // We add a no gc scope to ensure that the code below does not trigger
   // a GC as we are handling raw object references here. It is possible
   // that the code is called while a GC is in progress, that is ok.
 #if !defined(TARGET_OS_WINDOWS)
   // On Windows, the profiler calls this from a separate thread where
   // Thread::Current() is NULL, so we cannot create a NoSafepointScope.
   NoSafepointScope no_safepoint;
 #endif
   RawCode* code = GetCodeObject();
   if ((code != Code::null()) &&
@@ skipping 75 matching lines @@
 
 bool StackFrame::IsValid() const {
   if (IsEntryFrame() || IsExitFrame() || IsStubFrame()) {
     return true;
   }
   return (LookupDartCode() != Code::null());
 }
 
 
 void StackFrameIterator::SetupLastExitFrameData() {
-  uword exit_marker = Thread::Current()->top_exit_frame_info();
+  ASSERT(thread_ != NULL);
+  uword exit_marker = thread_->top_exit_frame_info();

[srdjan, 2015/10/20 21:33:47]

Please sync with my temporary fix and remove Isolate::top_exit_frame_info()

[Cutch, 2015/10/20 21:39:01]

Done.

   frames_.fp_ = exit_marker;
 }
 
 
 void StackFrameIterator::SetupNextExitFrameData() {
   uword exit_address = entry_.fp() + (kExitLinkSlotFromEntryFp * kWordSize);
   uword exit_marker = *reinterpret_cast<uword*>(exit_address);
   frames_.fp_ = exit_marker;
   frames_.sp_ = 0;
   frames_.pc_ = 0;
 }
 
 
 // Tell MemorySanitizer that generated code initializes part of the stack.
 // TODO(koda): Limit to frames that are actually written by generated code.
 static void UnpoisonStack(Isolate* isolate, uword fp) {
   ASSERT(fp != 0);
   uword size = isolate->GetSpecifiedStackSize();
   MSAN_UNPOISON(reinterpret_cast<void*>(fp - size), 2 * size);
 }
 
 
-StackFrameIterator::StackFrameIterator(bool validate, Isolate* isolate)
+StackFrameIterator::StackFrameIterator(bool validate,
+                                       Thread* thread)

[srdjan, 2015/10/20 21:33:47]

One line.

[Cutch, 2015/10/20 21:39:01]

Done.

     : validate_(validate),
-      entry_(isolate),
-      exit_(isolate),
-      frames_(isolate),
+      entry_(thread),
+      exit_(thread),
+      frames_(thread),
       current_frame_(NULL),
-      isolate_(isolate) {
-  ASSERT((isolate_ == Isolate::Current()) ||
+      thread_(thread) {
+  ASSERT((thread_ == Thread::Current()) ||
          OS::AllowStackFrameIteratorFromAnotherThread());
   SetupLastExitFrameData();  // Setup data for last exit frame.
 }
 
 
 StackFrameIterator::StackFrameIterator(uword last_fp, bool validate,
-                                       Isolate* isolate)
+                                       Thread* thread)
     : validate_(validate),
-      entry_(isolate),
-      exit_(isolate),
-      frames_(isolate),
+      entry_(thread),
+      exit_(thread),
+      frames_(thread),
       current_frame_(NULL),
-      isolate_(isolate) {
-  ASSERT((isolate_ == Isolate::Current()) ||
+      thread_(thread) {
+  ASSERT((thread_ == Thread::Current()) ||
          OS::AllowStackFrameIteratorFromAnotherThread());
   frames_.fp_ = last_fp;
   frames_.sp_ = 0;
   frames_.pc_ = 0;
 }
 
 
 StackFrameIterator::StackFrameIterator(uword fp, uword sp, uword pc,
-                                       bool validate, Isolate* isolate)
+                                       bool validate, Thread* thread)
     : validate_(validate),
-      entry_(isolate),
-      exit_(isolate),
-      frames_(isolate),
+      entry_(thread),
+      exit_(thread),
+      frames_(thread),
       current_frame_(NULL),
-      isolate_(isolate) {
-  ASSERT((isolate_ == Isolate::Current()) ||
+      thread_(thread) {
+  ASSERT((thread_ == Thread::Current()) ||
          OS::AllowStackFrameIteratorFromAnotherThread());
   frames_.fp_ = fp;
   frames_.sp_ = sp;
   frames_.pc_ = pc;
 }
 
 
 StackFrame* StackFrameIterator::NextFrame() {
   // When we are at the start of iteration after having created an
   // iterator object, current_frame_ will be NULL as we haven't seen
   // any frames yet (unless we start iterating in the simulator from a given
   // triplet of fp, sp, and pc). At this point, if NextFrame is called, it tries
   // to set up the next exit frame by reading the top_exit_frame_info
   // from the isolate. If we do not have any dart invocations yet,
   // top_exit_frame_info will be 0 and so we would return NULL.
 
   // current_frame_ will also be NULL, when we are at the end of having
   // iterated through all the frames. If NextFrame is called at this
   // point, we will try and set up the next exit frame, but since we are
   // at the end of the iteration, fp_ will be 0 and we would return NULL.
   if (current_frame_ == NULL) {
     if (!HasNextFrame()) {
       return NULL;
     }
-    UnpoisonStack(isolate_, frames_.fp_);
+    UnpoisonStack(thread_->isolate(), frames_.fp_);
     if (frames_.pc_ == 0) {
       // Iteration starts from an exit frame given by its fp.
       current_frame_ = NextExitFrame();
     } else if (*(reinterpret_cast<uword*>(
         frames_.fp_ + (kSavedCallerFpSlotFromFp * kWordSize))) == 0) {
       // Iteration starts from an entry frame given by its fp, sp, and pc.
       current_frame_ = NextEntryFrame();
     } else {
       // Iteration starts from a Dart or stub frame given by its fp, sp, and pc.
       current_frame_ = frames_.NextFrame(validate_);
@@ skipping 126 matching lines @@
     if (deopt_instr->kind() == DeoptInstr::kCallerFp) {
       return (index - num_materializations_);
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 }  // namespace dart