diff options
author | Mingyao Yang <mingyao@google.com> | 2015-05-18 12:12:50 -0700 |
---|---|---|
committer | Mingyao Yang <mingyao@google.com> | 2015-06-18 13:42:03 -0700 |
commit | ef484d442a3dcae2cd1842c5be0623f5cf71e4ab (patch) | |
tree | 5c50bd5b9d213a1072b8955e845ba2df6f18d66e /runtime/interpreter | |
parent | 07c6f5a3eb17e08f3f2d850e130896f63c80911f (diff) | |
download | art-ef484d442a3dcae2cd1842c5be0623f5cf71e4ab.tar.gz art-ef484d442a3dcae2cd1842c5be0623f5cf71e4ab.tar.bz2 art-ef484d442a3dcae2cd1842c5be0623f5cf71e4ab.zip |
Fix nested deoptimization.
Handle nested deoptimization cases. Create a stacked shadow frame
records to keep track of deoptimization shadow frames. Shadow frames
under construction can be tracked in the same stack.
Bug: 20845490
(cherry picked from commit 1f2d3ba6af52cf6f566deb38b7e07735c9a08fb6)
Change-Id: I768285792c29e7c3cfcd21e7a2600802506024d8
Diffstat (limited to 'runtime/interpreter')
-rw-r--r-- | runtime/interpreter/interpreter_common.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index 1ed1a649b8..3f2e6db716 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -517,7 +517,8 @@ bool DoCall(ArtMethod* called_method, Thread* self, ShadowFrame& shadow_frame, // Slow path. // We might need to do class loading, which incurs a thread state change to kNative. So // register the shadow frame as under construction and allow suspension again. - self->SetShadowFrameUnderConstruction(new_shadow_frame); + ScopedStackedShadowFramePusher pusher( + self, new_shadow_frame, kShadowFrameUnderConstruction); self->EndAssertNoThreadSuspension(old_cause); // We need to do runtime check on reference assignment. We need to load the shorty @@ -590,8 +591,6 @@ bool DoCall(ArtMethod* called_method, Thread* self, ShadowFrame& shadow_frame, break; } } - // We're done with the construction. - self->ClearShadowFrameUnderConstruction(); } else { // Fast path: no extra checks. if (is_range) { |