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 253 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();
   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,
+                                       Isolate* isolate,
+                                       Thread* thread)
     : validate_(validate),
       entry_(isolate),
       exit_(isolate),
       frames_(isolate),
       current_frame_(NULL),
-      isolate_(isolate) {
+      isolate_(isolate),
+      thread_(thread) {
   ASSERT((isolate_ == Isolate::Current()) ||
          OS::AllowStackFrameIteratorFromAnotherThread());
   SetupLastExitFrameData();  // Setup data for last exit frame.
 }
 
 
 StackFrameIterator::StackFrameIterator(uword last_fp, bool validate,
-                                       Isolate* isolate)
+                                       Isolate* isolate, Thread* thread)
     : validate_(validate),
       entry_(isolate),
       exit_(isolate),
       frames_(isolate),
       current_frame_(NULL),
-      isolate_(isolate) {
+      isolate_(isolate),
+      thread_(thread) {
   ASSERT((isolate_ == Isolate::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, Isolate* isolate,
+                                       Thread* thread)
     : validate_(validate),
       entry_(isolate),
       exit_(isolate),
       frames_(isolate),
       current_frame_(NULL),
-      isolate_(isolate) {
+      isolate_(isolate),
+      thread_(thread) {
   ASSERT((isolate_ == Isolate::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
@@ skipping 152 matching lines @@
     if (deopt_instr->kind() == DeoptInstr::kCallerFp) {
       return (index - num_materializations_);
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 }  // namespace dart