From 327497e303903f300b01f77f2259fd5b61238ee3 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 4 Mar 2019 12:53:20 +0000 Subject: Move CompilerDriver to dex2oat/. Also DexToDexCompiler, QuickCompilerCallbacks and tests. aosp_taimen-userdebug: - before: lib64/libart-compiler.so: 3112344 lib/libart-compiler.so: 2312908 bin/dex2oat: 563176 - after: lib64/libart-compiler.so: 2986720 (-123KiB) lib/libart-compiler.so: 2219852 (-91KiB) bin/dex2oat: 635832 (+71KiB) Test: m test-art-host-gtest Test: testrunner.py --host --optimizing --jit Change-Id: I36e63b83dff1d5c731d05de27d3663cfc81de6ad --- compiler/dex/quick_compiler_callbacks.h | 81 --------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 compiler/dex/quick_compiler_callbacks.h (limited to 'compiler/dex/quick_compiler_callbacks.h') diff --git a/compiler/dex/quick_compiler_callbacks.h b/compiler/dex/quick_compiler_callbacks.h deleted file mode 100644 index e92b67a0e8..0000000000 --- a/compiler/dex/quick_compiler_callbacks.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2011 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_DEX_QUICK_COMPILER_CALLBACKS_H_ -#define ART_COMPILER_DEX_QUICK_COMPILER_CALLBACKS_H_ - -#include "compiler_callbacks.h" -#include "verifier/verifier_deps.h" - -namespace art { - -class CompilerDriver; -class DexFile; -class VerificationResults; - -class QuickCompilerCallbacks final : public CompilerCallbacks { - public: - explicit QuickCompilerCallbacks(CompilerCallbacks::CallbackMode mode) - : CompilerCallbacks(mode), dex_files_(nullptr) {} - - ~QuickCompilerCallbacks() { } - - void MethodVerified(verifier::MethodVerifier* verifier) - REQUIRES_SHARED(Locks::mutator_lock_) override; - - void ClassRejected(ClassReference ref) override; - - verifier::VerifierDeps* GetVerifierDeps() const override { - return verifier_deps_.get(); - } - - void SetVerifierDeps(verifier::VerifierDeps* deps) override { - verifier_deps_.reset(deps); - } - - void SetVerificationResults(VerificationResults* verification_results) { - verification_results_ = verification_results; - } - - ClassStatus GetPreviousClassState(ClassReference ref) override; - - void SetDoesClassUnloading(bool does_class_unloading, CompilerDriver* compiler_driver) - override { - does_class_unloading_ = does_class_unloading; - compiler_driver_ = compiler_driver; - DCHECK(!does_class_unloading || compiler_driver_ != nullptr); - } - - void UpdateClassState(ClassReference ref, ClassStatus state) override; - - bool CanUseOatStatusForVerification(mirror::Class* klass) override - REQUIRES_SHARED(Locks::mutator_lock_); - - void SetDexFiles(const std::vector* dex_files) { - dex_files_ = dex_files; - } - - private: - VerificationResults* verification_results_ = nullptr; - bool does_class_unloading_ = false; - CompilerDriver* compiler_driver_ = nullptr; - std::unique_ptr verifier_deps_; - const std::vector* dex_files_; -}; - -} // namespace art - -#endif // ART_COMPILER_DEX_QUICK_COMPILER_CALLBACKS_H_ -- cgit v1.2.3-59-g8ed1b