diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-29 21:31:50 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-30 12:46:10 -0700 |
| commit | 5cf98196d488437acd1e989c08a554ef697fded1 (patch) | |
| tree | dd44bc0120562169b701e80dbec413a179862beb /runtime/stack.h | |
| parent | b7f02280f7f56ae94fe7f01e161be0b725b6e4a9 (diff) | |
| download | art-5cf98196d488437acd1e989c08a554ef697fded1.zip art-5cf98196d488437acd1e989c08a554ef697fded1.tar.gz art-5cf98196d488437acd1e989c08a554ef697fded1.tar.bz2 | |
Don't report down-calls as unhandled exceptions.
Bug: 15310540
Also, narrow scope of catch/deoptimize stack visitors that are specific to
quick exception delivery.
Change-Id: Ib13a006ce1347acb93a36b0186550d4c3ec2034b
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index e93fcbc..fabdd4f 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -557,6 +557,10 @@ class StackVisitor { return num_frames_; } + // Get the method and dex pc immediately after the one that's currently being visited. + bool GetNextMethodAndDexPc(mirror::ArtMethod** next_method, uint32_t* next_dex_pc) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + uint32_t GetVReg(mirror::ArtMethod* m, uint16_t vreg, VRegKind kind) const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -691,6 +695,10 @@ class StackVisitor { static void DescribeStack(Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); private: + // Private constructor known in the case that num_frames_ has already been computed. + StackVisitor(Thread* thread, Context* context, size_t num_frames) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + instrumentation::InstrumentationStackFrame& GetInstrumentationStackFrame(uint32_t depth) const; void SanityCheckFrame() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |