commit 7a22fa657b972e8323692368975bc5a7be1cc0f5
author Ian Rogers <irogers@google.com> Wed Jan 23 12:16:16 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Jan 23 12:21:05 2013 -0800
tree 4fe55837daae4e252eeaccf1be931f2e7ed434cb
parent 87b185f3bfd766001dcd5977fc0ee0489e5a8a28

Refactor StackVisitor to take a Thread*.

This allows assertion checking on the thread, principally that we never try to
walk the stack of an unsuspended thread.
Fix bug in the OwnedMonitorVisitor where GetVReg could be called on a
StackVisitor with no context.

Change-Id: I06539b624b253b6fb7385e7be11a4bced1d417b2

src/stack.h

diff --git a/src/stack.h b/src/stack.h
index c3b837f..8d0efe9 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -331,13 +331,7 @@
 
 class StackVisitor {
  protected:
-  StackVisitor(const ManagedStack* stack,
-               const std::deque<InstrumentationStackFrame>* instrumentation_stack,
-               Context* context)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
-      : stack_start_(stack), instrumentation_stack_(instrumentation_stack), cur_shadow_frame_(NULL),
-        cur_quick_frame_(NULL), cur_quick_frame_pc_(0), num_frames_(0), cur_depth_(0),
-        context_(context) {}
+  StackVisitor(Thread* thread, Context* context) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
  public:
   virtual ~StackVisitor() {}
@@ -389,7 +383,7 @@
 
   size_t GetNumFrames() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     if (num_frames_ == 0) {
-      num_frames_ = ComputeNumFrames(stack_start_, instrumentation_stack_);
+      num_frames_ = ComputeNumFrames(thread_);
     }
     return num_frames_;
   }
@@ -493,24 +487,17 @@
 
   std::string DescribeLocation() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  static size_t ComputeNumFrames(const ManagedStack* stack,
-                                 const std::deque<InstrumentationStackFrame>* instr_stack)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  static size_t ComputeNumFrames(Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  static void DescribeStack(const ManagedStack* stack,
-                            const std::deque<InstrumentationStackFrame>* instr_stack)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  static void DescribeStack(Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
  private:
 
-  InstrumentationStackFrame GetInstrumentationStackFrame(uint32_t depth) const {
-    return instrumentation_stack_->at(depth);
-  }
+  InstrumentationStackFrame GetInstrumentationStackFrame(uint32_t depth) const;
 
   void SanityCheckFrame() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  const ManagedStack* const stack_start_;
-  const std::deque<InstrumentationStackFrame>* const instrumentation_stack_;
+  Thread* const thread_;
   ShadowFrame* cur_shadow_frame_;
   AbstractMethod** cur_quick_frame_;
   uintptr_t cur_quick_frame_pc_;