diff options
| author | 2017-04-21 18:57:25 +0000 | |
|---|---|---|
| committer | 2017-04-21 18:57:27 +0000 | |
| commit | 6b8b07521125e7744327d00e64f897b4dd5d1db9 (patch) | |
| tree | 1a8d6cd6c50fdcb5edc388588e36eb41c78e1324 /compiler/optimizing/code_generator.cc | |
| parent | e0ffd22714fd4bc4edf81000966b98eae59788dd (diff) | |
| parent | a1d2f957a21319d1110bebb9a52f46fd1c67ffaf (diff) | |
Merge changes I6ff2d6f8,I8f60f116
* changes:
ART: Clean up art_field.h
ART: Clean up art_method.h
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index b7c80756b0..c840e70660 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -42,6 +42,7 @@ #endif #include "bytecode_utils.h" +#include "class_linker.h" #include "compiled_method.h" #include "dex/verified_method.h" #include "driver/compiler_driver.h" @@ -51,9 +52,12 @@ #include "mirror/array-inl.h" #include "mirror/object_array-inl.h" #include "mirror/object_reference.h" +#include "mirror/reference.h" #include "mirror/string.h" #include "parallel_move_resolver.h" #include "ssa_liveness_analysis.h" +#include "scoped_thread_state_change-inl.h" +#include "thread-inl.h" #include "utils/assembler.h" namespace art { |