summaryrefslogtreecommitdiff
path: root/compiler/dex/compiler_ir.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2014-02-19 19:25:43 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-02-19 19:25:43 +0000
commit86ce70d30fcebf41273a9a9fd86eaa9b33c0ab56 (patch)
tree33349e963d586f1921516f2b5bd60ed4aae50001 /compiler/dex/compiler_ir.h
parentc6721975fa5195bd4d2d5b91483677223b779454 (diff)
parent818f2107e6d2d9e80faac8ae8c92faffa83cbd11 (diff)
Merge "Re-apply: Initial check-in of an optimizing compiler."
Diffstat (limited to 'compiler/dex/compiler_ir.h')
-rw-r--r--compiler/dex/compiler_ir.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h
index ea8eb1cfa2..ded8005405 100644
--- a/compiler/dex/compiler_ir.h
+++ b/compiler/dex/compiler_ir.h
@@ -19,7 +19,6 @@
#include <vector>
#include <llvm/IR/Module.h>
-#include "arena_allocator.h"
#include "compiler_enums.h"
#include "dex/quick/mir_to_lir.h"
#include "dex_instruction.h"
@@ -29,6 +28,7 @@
#include "llvm/ir_builder.h"
#include "safe_map.h"
#include "base/timing_logger.h"
+#include "utils/arena_allocator.h"
namespace art {