From 55f1fed0c404146429d38c41b9dd1647db238ba5 Mon Sep 17 00:00:00 2001 From: Almaz Mingaleev Date: Fri, 12 Apr 2024 07:15:38 +0000 Subject: Revert^4 "x86_64: Add JIT support for LoadMethodType." This reverts commit b63adc919ba9a53f4fbad476356c702845821149. Bringing back map from ArtMethod to code pointers. Bug: 297147201 Test: CtsPerfettoTestCases Test: ./art/test/testrunner/testrunner.py --host --64 --jit -b Test: ./art/test/testrunner/testrunner.py --host --64 --jit --cms -b Test: ./art/test/testrunner/testrunner.py --host --64 -b Test: ./art/test.py --host -b Change-Id: I6a1c50598ec878393edf8ef895274da79d4ab42d --- compiler/optimizing/code_generator.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index aec7b45a1a..950bae5c8f 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -29,10 +29,12 @@ #include "base/memory_region.h" #include "base/pointer_size.h" #include "class_root.h" +#include "dex/proto_reference.h" #include "dex/string_reference.h" #include "dex/type_reference.h" #include "graph_visualizer.h" #include "locations.h" +#include "mirror/method_type.h" #include "nodes.h" #include "oat/oat_quick_method_header.h" #include "optimizing_compiler_stats.h" @@ -834,6 +836,9 @@ class CodeGenerator : public DeletableArenaObject { uint64_t GetJitStringRootIndex(StringReference string_reference); void ReserveJitClassRoot(TypeReference type_reference, Handle klass); uint64_t GetJitClassRootIndex(TypeReference type_reference); + void ReserveJitMethodTypeRoot(ProtoReference proto_reference, + Handle method_type); + uint64_t GetJitMethodTypeRootIndex(ProtoReference proto_reference); // Emit the patches assocatied with JIT roots. Only applies to JIT compiled code. virtual void EmitJitRootPatches(uint8_t* code, const uint8_t* roots_data); -- cgit v1.2.3-59-g8ed1b