diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-09 15:52:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-09 15:52:51 +0000 |
| commit | 9e878d50567f624094f3c4940ac3aedbc5eff3b9 (patch) | |
| tree | 3b4f118d07fcdd8d64308e847e0140c0115448bf /compiler/optimizing | |
| parent | 51205042343fa4852e01919de01fdcf261af510b (diff) | |
| parent | 0279ebb3efd653e6bb255470c99d26949c7bcd95 (diff) | |
| download | art-9e878d50567f624094f3c4940ac3aedbc5eff3b9.zip art-9e878d50567f624094f3c4940ac3aedbc5eff3b9.tar.gz art-9e878d50567f624094f3c4940ac3aedbc5eff3b9.tar.bz2 | |
Merge "Tidy ELF builder."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/builder.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/graph_visualizer.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/locations.h | 3 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/parallel_move_resolver.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/stack_map_stream.h | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h index 7d7b188..e68cdb0 100644 --- a/compiler/optimizing/builder.h +++ b/compiler/optimizing/builder.h @@ -22,7 +22,7 @@ #include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "primitive.h" -#include "utils/allocation.h" +#include "utils/arena_object.h" #include "utils/growable_array.h" #include "nodes.h" diff --git a/compiler/optimizing/graph_visualizer.h b/compiler/optimizing/graph_visualizer.h index 6e2c6fd..f17ba3b 100644 --- a/compiler/optimizing/graph_visualizer.h +++ b/compiler/optimizing/graph_visualizer.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_GRAPH_VISUALIZER_H_ #define ART_COMPILER_OPTIMIZING_GRAPH_VISUALIZER_H_ -#include "utils/allocation.h" +#include "base/value_object.h" namespace art { diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h index ac44a42..24d7ad3 100644 --- a/compiler/optimizing/locations.h +++ b/compiler/optimizing/locations.h @@ -19,7 +19,8 @@ #include "base/bit_field.h" #include "base/bit_vector.h" -#include "utils/allocation.h" +#include "base/value_object.h" +#include "utils/arena_object.h" #include "utils/growable_array.h" namespace art { diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index fc5b06d..2010e7e 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -20,7 +20,7 @@ #include "locations.h" #include "offsets.h" #include "primitive.h" -#include "utils/allocation.h" +#include "utils/arena_object.h" #include "utils/arena_bit_vector.h" #include "utils/growable_array.h" diff --git a/compiler/optimizing/parallel_move_resolver.h b/compiler/optimizing/parallel_move_resolver.h index fcc1de6..309425e 100644 --- a/compiler/optimizing/parallel_move_resolver.h +++ b/compiler/optimizing/parallel_move_resolver.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_PARALLEL_MOVE_RESOLVER_H_ #define ART_COMPILER_OPTIMIZING_PARALLEL_MOVE_RESOLVER_H_ -#include "utils/allocation.h" +#include "base/value_object.h" #include "utils/growable_array.h" namespace art { diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h index 0ea11ad..5f74c33 100644 --- a/compiler/optimizing/stack_map_stream.h +++ b/compiler/optimizing/stack_map_stream.h @@ -18,9 +18,9 @@ #define ART_COMPILER_OPTIMIZING_STACK_MAP_STREAM_H_ #include "base/bit_vector.h" +#include "base/value_object.h" #include "memory_region.h" #include "stack_map.h" -#include "utils/allocation.h" #include "utils/growable_array.h" namespace art { |