diff options
author | Brian Carlstrom <bdc@google.com> | 2014-02-10 23:48:36 -0800 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2014-02-24 14:24:12 -0800 |
commit | 6449c62e40ef3a9bb75f664f922555affb532ee4 (patch) | |
tree | 2f1b2120bd648c95dea32b68c8e168e42c8e24fd /compiler/driver/compiler_callbacks_impl.h | |
parent | 3fcf18e25241253f23efbeebe77b2a4c4a7c54d3 (diff) | |
download | art-6449c62e40ef3a9bb75f664f922555affb532ee4.zip art-6449c62e40ef3a9bb75f664f922555affb532ee4.tar.gz art-6449c62e40ef3a9bb75f664f922555affb532ee4.tar.bz2 |
Create CompilerOptions
Package up most compiler related options in CompilerOptions. Details include:
- Includes compiler filter, method thresholds, SEA IR mode.
- Excludes those needed during Runtime::Init such as CompilerCallbacks and VerificationResults.
- Pass CompilerOptions to CompilerDriver.
- Remove CompilerOptions from Runtime.
- Add ability to pass options for app and image dex2oat to runtime via
-Xcompiler-option and -Ximage-compiler-option respectively.
Other
- Replace 2x CompilerCallbacks implementations with one.
- Factor out execv code for use by both image and oat generation.
- More OatFile error_msg reporting.
- DCHECK for SuspendAll found trying to run valgrind.
Change-Id: Iecb57da907be0c856d00c3cd634b5042a229e620
Diffstat (limited to 'compiler/driver/compiler_callbacks_impl.h')
-rw-r--r-- | compiler/driver/compiler_callbacks_impl.h | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/compiler/driver/compiler_callbacks_impl.h b/compiler/driver/compiler_callbacks_impl.h new file mode 100644 index 0000000..ab57832 --- /dev/null +++ b/compiler/driver/compiler_callbacks_impl.h @@ -0,0 +1,59 @@ +/* + * 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_DRIVER_COMPILER_CALLBACKS_IMPL_H_ +#define ART_COMPILER_DRIVER_COMPILER_CALLBACKS_IMPL_H_ + +#include "compiler_callbacks.h" +#include "dex/quick/dex_file_to_method_inliner_map.h" +#include "verifier/method_verifier-inl.h" + +namespace art { + +class CompilerCallbacksImpl : public CompilerCallbacks { + public: + CompilerCallbacksImpl(VerificationResults* verification_results, + DexFileToMethodInlinerMap* method_inliner_map) + : verification_results_(verification_results), + method_inliner_map_(method_inliner_map) { + CHECK(verification_results != nullptr); + CHECK(method_inliner_map != nullptr); + } + + virtual ~CompilerCallbacksImpl() { } + + virtual bool MethodVerified(verifier::MethodVerifier* verifier) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + bool result = verification_results_->ProcessVerifiedMethod(verifier); + if (result) { + MethodReference ref = verifier->GetMethodReference(); + method_inliner_map_->GetMethodInliner(ref.dex_file) + ->AnalyseMethodCode(verifier); + } + return result; + } + virtual void ClassRejected(ClassReference ref) { + verification_results_->AddRejectedClass(ref); + } + + private: + VerificationResults* verification_results_; + DexFileToMethodInlinerMap* method_inliner_map_; +}; + +} // namespace art + +#endif // ART_COMPILER_DRIVER_COMPILER_CALLBACKS_IMPL_H_ |