From 82e525a4f5f08a72ea1b6907c0a10dacb77a8a87 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 12 Jan 2022 10:42:44 +0000
Subject: Use InitializeMethodsCode when we need to reinitialize a method
 entrypoint.

To make sure we use the best available entrypoint in such situations.

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

(limited to 'runtime/quick_exception_handler.cc')

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