summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-08 17:27:48 -0700
committerIan Rogers <irogers@google.com>2014-10-09 08:25:34 -0700
commit0279ebb3efd653e6bb255470c99d26949c7bcd95 (patch)
treed58b29754f7b3c88616e6e4d6c19346821d244ae /compiler/optimizing
parentf1f05d303988a5c071c87b760056be8358276c94 (diff)
downloadart-0279ebb3efd653e6bb255470c99d26949c7bcd95.tar.gz
art-0279ebb3efd653e6bb255470c99d26949c7bcd95.tar.bz2
art-0279ebb3efd653e6bb255470c99d26949c7bcd95.zip
Tidy ELF builder.
Don't do "if (ptr)". Use const. Use DISALLOW_COPY_AND_ASSIGN. Avoid public member variables. Move ValueObject to base and use in ELF builder. Tidy VectorOutputStream to not use non-const reference arguments. Change-Id: I2c727c3fc61769c3726de7cfb68b2d6eb4477e53
Diffstat (limited to 'compiler/optimizing')
-rw-r--r--compiler/optimizing/builder.h2
-rw-r--r--compiler/optimizing/graph_visualizer.h2
-rw-r--r--compiler/optimizing/locations.h3
-rw-r--r--compiler/optimizing/nodes.h2
-rw-r--r--compiler/optimizing/parallel_move_resolver.h2
-rw-r--r--compiler/optimizing/stack_map_stream.h2
6 files changed, 7 insertions, 6 deletions
diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h
index 7d7b188362..e68cdb0b1d 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 6e2c6fd11f..f17ba3bbac 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 5f85b6a0e1..e6b55c72a1 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"
#include "utils/managed_register.h"
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index fc5b06d0df..2010e7ef39 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 fcc1de6dc9..309425ef4d 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 0ea11ad04b..5f74c33643 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 {