commit 1f2d3ba6af52cf6f566deb38b7e07735c9a08fb6
author Mingyao Yang <mingyao@google.com> Mon May 18 12:12:50 2015 -0700
committer Mingyao Yang <mingyao@google.com> Mon Jun 08 00:53:55 2015 -0700
tree af6ae612d43c50703292d39a8a0b37dda3f919a6
parent ccd6337f31d13706c602f3d9436e9b4025075b63

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
Change-Id: I768285792c29e7c3cfcd21e7a2600802506024d8

runtime/instrumentation.cc

diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc
index 4ced23d..d37ddcb 100644
--- a/runtime/instrumentation.cc
+++ b/runtime/instrumentation.cc
@@ -1019,7 +1019,7 @@
                                 PrettyMethod(method).c_str(),
                                 return_value.GetJ()) << *self;
     }
-    self->SetDeoptimizationReturnValue(return_value);
+    self->SetDeoptimizationReturnValue(return_value, return_shorty == 'L');
     return GetTwoWordSuccessValue(*return_pc,
                                   reinterpret_cast<uintptr_t>(GetQuickDeoptimizationEntryPoint()));
   } else {