diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-05-08 14:19:26 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-05-08 15:09:17 -0700 |
| commit | 50030ef998be09789da4a9a56738362852068f12 (patch) | |
| tree | 02df1bd0954f9b970434d1363466b0cfe182bc12 /runtime/stack.h | |
| parent | 6727a48193db2a0cf01af971cccffe1a6518c247 (diff) | |
| download | art-50030ef998be09789da4a9a56738362852068f12.zip art-50030ef998be09789da4a9a56738362852068f12.tar.gz art-50030ef998be09789da4a9a56738362852068f12.tar.bz2 | |
Check IsReferenceVReg during deopt
Required since the quick GC maps may not agree with the verifier
ones. Without this check we may copy stale object references into
the shadow frame.
(cherry picked from commit f00baf56ef647684888a407dbb6adadd704a2039)
Bug: 20736048
Change-Id: I7783c8a8ee45cf601b08b4c38f1dec7f7d11380c
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 3f1bff8..ab8641b 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -478,6 +478,9 @@ class StackVisitor { bool GetNextMethodAndDexPc(mirror::ArtMethod** next_method, uint32_t* next_dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + bool IsReferenceVReg(mirror::ArtMethod* m, uint16_t vreg) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + bool GetVReg(mirror::ArtMethod* m, uint16_t vreg, VRegKind kind, uint32_t* val) const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |