diff options
| author | 2017-04-20 19:43:21 -0700 | |
|---|---|---|
| committer | 2017-04-21 09:41:03 -0700 | |
| commit | b95c74b9788886b24b04db782ce64867cb4960d5 (patch) | |
| tree | f9b01a5b509d70bf66cfb69433f23d7019b892ce | |
| parent | d68677c5fde1ace16ea58d65733776c954e7acb4 (diff) | |
ART: Move InlineMethodAnalyzer into compiler
Move the infrastructure, which is now only used by the compiler.
Test: mmma art
Change-Id: I4a61e35f23736b226523d7349f49208ad852ad2f
| -rw-r--r-- | compiler/Android.bp | 1 | ||||
| -rw-r--r-- | compiler/dex/inline_method_analyser.cc (renamed from runtime/quick/inline_method_analyser.cc) | 0 | ||||
| -rw-r--r-- | compiler/dex/inline_method_analyser.h (renamed from runtime/quick/inline_method_analyser.h) | 6 | ||||
| -rw-r--r-- | compiler/optimizing/inliner.cc | 2 | ||||
| -rw-r--r-- | runtime/Android.bp | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index 312fc7b35a..dec8b577d8 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -29,6 +29,7 @@ art_cc_defaults { "debug/elf_debug_writer.cc", "dex/dex_to_dex_compiler.cc", "dex/dex_to_dex_decompiler.cc", + "dex/inline_method_analyser.cc", "dex/verified_method.cc", "dex/verification_results.cc", "dex/quick_compiler_callbacks.cc", diff --git a/runtime/quick/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc index 3347070468..3347070468 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/compiler/dex/inline_method_analyser.cc diff --git a/runtime/quick/inline_method_analyser.h b/compiler/dex/inline_method_analyser.h index 2df2ced7f4..ab643abf21 100644 --- a/runtime/quick/inline_method_analyser.h +++ b/compiler/dex/inline_method_analyser.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_QUICK_INLINE_METHOD_ANALYSER_H_ -#define ART_RUNTIME_QUICK_INLINE_METHOD_ANALYSER_H_ +#ifndef ART_COMPILER_DEX_INLINE_METHOD_ANALYSER_H_ +#define ART_COMPILER_DEX_INLINE_METHOD_ANALYSER_H_ #include "base/macros.h" #include "base/mutex.h" @@ -274,4 +274,4 @@ class InlineMethodAnalyser { } // namespace art -#endif // ART_RUNTIME_QUICK_INLINE_METHOD_ANALYSER_H_ +#endif // ART_COMPILER_DEX_INLINE_METHOD_ANALYSER_H_ diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 4af2539812..1f8a58cdaa 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -22,6 +22,7 @@ #include "class_linker.h" #include "constant_folding.h" #include "dead_code_elimination.h" +#include "dex/inline_method_analyser.h" #include "dex/verified_method.h" #include "dex/verification_results.h" #include "driver/compiler_driver-inl.h" @@ -37,7 +38,6 @@ #include "optimizing_compiler.h" #include "reference_type_propagation.h" #include "register_allocator_linear_scan.h" -#include "quick/inline_method_analyser.h" #include "sharpening.h" #include "ssa_builder.h" #include "ssa_phi_elimination.h" diff --git a/runtime/Android.bp b/runtime/Android.bp index 8972e91321..2866d4b4a0 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -186,7 +186,6 @@ cc_defaults { "plugin.cc", "primitive.cc", "quick_exception_handler.cc", - "quick/inline_method_analyser.cc", "reference_table.cc", "reflection.cc", "runtime.cc", @@ -451,7 +450,6 @@ gensrcs { "oat.h", "object_callbacks.h", "process_state.h", - "quick/inline_method_analyser.h", "runtime.h", "stack.h", "thread.h", |