diff options
| -rw-r--r-- | compiler/Android.mk | 1 | ||||
| -rw-r--r-- | compiler/dex/gvn_dead_code_elimination.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/mir_graph.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/gvn.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/stack_map_test.cc | 3 | ||||
| -rw-r--r-- | compiler/utils/arena_allocator_test.cc | 2 | ||||
| -rw-r--r-- | runtime/Android.mk | 1 | ||||
| -rw-r--r-- | runtime/base/arena_bit_vector.cc (renamed from compiler/utils/arena_bit_vector.cc) | 0 | ||||
| -rw-r--r-- | runtime/base/arena_bit_vector.h (renamed from compiler/utils/arena_bit_vector.h) | 6 |
10 files changed, 11 insertions, 10 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index 58f70faca9..17f9d122a7 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -94,7 +94,6 @@ LIBART_COMPILER_SRC_FILES := \ optimizing/ssa_phi_elimination.cc \ optimizing/stack_map_stream.cc \ trampolines/trampoline_compiler.cc \ - utils/arena_bit_vector.cc \ utils/assembler.cc \ utils/swap_space.cc \ buffered_output_stream.cc \ diff --git a/compiler/dex/gvn_dead_code_elimination.cc b/compiler/dex/gvn_dead_code_elimination.cc index 4de3410616..445859cc78 100644 --- a/compiler/dex/gvn_dead_code_elimination.cc +++ b/compiler/dex/gvn_dead_code_elimination.cc @@ -18,6 +18,7 @@ #include "gvn_dead_code_elimination.h" +#include "base/arena_bit_vector.h" #include "base/bit_vector-inl.h" #include "base/macros.h" #include "base/allocator.h" @@ -26,7 +27,6 @@ #include "dex_instruction.h" #include "dex/mir_graph.h" #include "local_value_numbering.h" -#include "utils/arena_bit_vector.h" namespace art { diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index 097abdc018..2da8a98f00 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -19,6 +19,7 @@ #include <stdint.h> +#include "base/arena_bit_vector.h" #include "base/arena_containers.h" #include "base/bit_utils.h" #include "base/scoped_arena_containers.h" @@ -30,7 +31,6 @@ #include "mir_method_info.h" #include "reg_location.h" #include "reg_storage.h" -#include "utils/arena_bit_vector.h" namespace art { diff --git a/compiler/optimizing/gvn.cc b/compiler/optimizing/gvn.cc index 0a1758a936..c36de84064 100644 --- a/compiler/optimizing/gvn.cc +++ b/compiler/optimizing/gvn.cc @@ -16,11 +16,11 @@ #include "gvn.h" +#include "base/arena_bit_vector.h" #include "base/arena_containers.h" #include "base/bit_vector-inl.h" #include "side_effects_analysis.h" #include "utils.h" -#include "utils/arena_bit_vector.h" namespace art { diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index cadb24c659..7aa933ddf0 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -21,6 +21,7 @@ #include <array> #include <type_traits> +#include "base/arena_bit_vector.h" #include "base/arena_containers.h" #include "base/arena_object.h" #include "base/stl_util.h" @@ -34,7 +35,6 @@ #include "mirror/class.h" #include "offsets.h" #include "primitive.h" -#include "utils/arena_bit_vector.h" namespace art { diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index c4a3b28aed..560502fde6 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -15,8 +15,9 @@ */ #include "stack_map.h" + +#include "base/arena_bit_vector.h" #include "stack_map_stream.h" -#include "utils/arena_bit_vector.h" #include "gtest/gtest.h" diff --git a/compiler/utils/arena_allocator_test.cc b/compiler/utils/arena_allocator_test.cc index 706552739f..7f67ef14bd 100644 --- a/compiler/utils/arena_allocator_test.cc +++ b/compiler/utils/arena_allocator_test.cc @@ -15,8 +15,8 @@ */ #include "base/arena_allocator.h" +#include "base/arena_bit_vector.h" #include "gtest/gtest.h" -#include "utils/arena_bit_vector.h" namespace art { diff --git a/runtime/Android.mk b/runtime/Android.mk index 9236ffb032..09d73119e6 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -25,6 +25,7 @@ LIBART_COMMON_SRC_FILES := \ barrier.cc \ base/allocator.cc \ base/arena_allocator.cc \ + base/arena_bit_vector.cc \ base/bit_vector.cc \ base/hex_dump.cc \ base/logging.cc \ diff --git a/compiler/utils/arena_bit_vector.cc b/runtime/base/arena_bit_vector.cc index fbbfd84fcf..fbbfd84fcf 100644 --- a/compiler/utils/arena_bit_vector.cc +++ b/runtime/base/arena_bit_vector.cc diff --git a/compiler/utils/arena_bit_vector.h b/runtime/base/arena_bit_vector.h index f2a74527da..d6061662c2 100644 --- a/compiler/utils/arena_bit_vector.h +++ b/runtime/base/arena_bit_vector.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_UTILS_ARENA_BIT_VECTOR_H_ -#define ART_COMPILER_UTILS_ARENA_BIT_VECTOR_H_ +#ifndef ART_RUNTIME_BASE_ARENA_BIT_VECTOR_H_ +#define ART_RUNTIME_BASE_ARENA_BIT_VECTOR_H_ #include "base/arena_object.h" #include "base/bit_vector.h" @@ -65,4 +65,4 @@ class ArenaBitVector : public BitVector, public ArenaObject<kArenaAllocGrowableB } // namespace art -#endif // ART_COMPILER_UTILS_ARENA_BIT_VECTOR_H_ +#endif // ART_RUNTIME_BASE_ARENA_BIT_VECTOR_H_ |