From b0f63c93e44bf53a34dda90c74b8725a932922da Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 13 Jan 2022 17:49:37 +0000
Subject: Revert "Use InitializeMethodsCode when we need to reinitialize a
 method entrypoint."

This reverts commit 82e525a4f5f08a72ea1b6907c0a10dacb77a8a87.

Reason for revert: Fails a test

Change-Id: Iab83b543b99fb6f6d5d9be22cd10d4eb88312d4b
---
 runtime/quick_exception_handler.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime/quick_exception_handler.cc')

diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index c3722484ca..ac5065b2a6 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -606,8 +606,9 @@ void QuickExceptionHandler::DeoptimizeSingleFrame(DeoptimizationKind kind) {
     Runtime::Current()->GetJit()->GetCodeCache()->InvalidateCompiledCodeFor(
         deopt_method, visitor.GetSingleFrameDeoptQuickMethodHeader());
   } else {
-    Runtime::Current()->GetInstrumentation()->InitializeMethodsCode(
-        deopt_method, /*aot_code=*/ nullptr);
+    // Transfer the code to interpreter.
+    Runtime::Current()->GetInstrumentation()->UpdateMethodsCode(
+        deopt_method, GetQuickToInterpreterBridge());
   }
 
   PrepareForLongJumpToInvokeStubOrInterpreterBridge();
-- 
cgit v1.2.3-59-g8ed1b