From e713d9338ad122d6b8c7997387d0c9fc464eea3e Mon Sep 17 00:00:00 2001
From: Sebastien Hertz <shertz@google.com>
Date: Thu, 15 May 2014 10:48:53 +0200
Subject: Fix JDWP location event report on return instructions

After change https://android-review.googlesource.com/94334, the debugger may
listen to kDexPcChange event without listening for kMethodExit event. In this
case, we need to report kDexPcChange event on RETURN instructions.

Bug: 11874828
Change-Id: Ic61f4eec71e7ece494bee628d7f3358a616d31d3
---
 runtime/debugger.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/debugger.cc')

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index edf54be014..f6b4891af5 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -2809,6 +2809,7 @@ void Dbg::RequestDeoptimizationLocked(const DeoptimizationRequest& req) {
     }
     case DeoptimizationRequest::kFullUndeoptimization: {
       DCHECK(req.method == nullptr);
+      DCHECK_GT(full_deoptimization_event_count_, 0U);
       --full_deoptimization_event_count_;
       if (full_deoptimization_event_count_ == 0) {
         VLOG(jdwp) << "Queue request #" << deoptimization_requests_.size()
-- 
cgit v1.2.3-59-g8ed1b