From d5a43192e44935605aa9abba6beb31760ef57da0 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Fri, 30 Sep 2022 16:18:02 +0200
Subject: ART: Move `CompiledMethod{,-Storage}` to dex2oat/.

Introduce a `CompiledCodeStorage` interface for callbacks to
`dex2oat` for storing code produced by `libart-compiler`.
Using this new interface, move `CompiledMethodStorage`
(this is a misnomer as it's also storing non-method thunk
code), `CompiledMethod` and `SwapSpace` to dex2oat/.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing --jit
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Change-Id: Icb7ffc134d00e53c25bd665d044dd1c98bd49a64
---
 compiler/compiled_method-inl.h | 55 ------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 compiler/compiled_method-inl.h

(limited to 'compiler/compiled_method-inl.h')

diff --git a/compiler/compiled_method-inl.h b/compiler/compiled_method-inl.h
deleted file mode 100644
index e60b30fed2..0000000000
--- a/compiler/compiled_method-inl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ART_COMPILER_COMPILED_METHOD_INL_H_
-#define ART_COMPILER_COMPILED_METHOD_INL_H_
-
-#include "compiled_method.h"
-
-#include "base/array_ref.h"
-#include "base/length_prefixed_array.h"
-#include "linker/linker_patch.h"
-
-namespace art {
-
-inline ArrayRef<const uint8_t> CompiledCode::GetQuickCode() const {
-  return GetArray(quick_code_);
-}
-
-template <typename T>
-inline ArrayRef<const T> CompiledCode::GetArray(const LengthPrefixedArray<T>* array) {
-  if (array == nullptr) {
-    return ArrayRef<const T>();
-  }
-  DCHECK_NE(array->size(), 0u);
-  return ArrayRef<const T>(&array->At(0), array->size());
-}
-
-inline ArrayRef<const uint8_t> CompiledMethod::GetVmapTable() const {
-  return GetArray(vmap_table_);
-}
-
-inline ArrayRef<const uint8_t> CompiledMethod::GetCFIInfo() const {
-  return GetArray(cfi_info_);
-}
-
-inline ArrayRef<const linker::LinkerPatch> CompiledMethod::GetPatches() const {
-  return GetArray(patches_);
-}
-
-}  // namespace art
-
-#endif  // ART_COMPILER_COMPILED_METHOD_INL_H_
-- 
cgit v1.2.3-59-g8ed1b