summaryrefslogtreecommitdiff
path: root/src/compiler_llvm/method_compiler.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-02-01 21:45:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-02-01 21:45:39 +0000
commit5d78f9c6045878c9e448d47b688dd89eaf476a83 (patch)
tree32850692eb4565a4ee3eaf122da32debec45b4c2 /src/compiler_llvm/method_compiler.cc
parente9de2dd6bd51f9be3457b5e2ffdd97f457ddebcb (diff)
parent641ce0371c2f0dc95d26be02d8366124c8b66653 (diff)
Merge "Rename compiler_llvm CompilationUnit to LlvmCompilationUnit" into dalvik-dev
Diffstat (limited to 'src/compiler_llvm/method_compiler.cc')
-rw-r--r--src/compiler_llvm/method_compiler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 76b1299b6f..47d9b015ff 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -20,11 +20,11 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
-#include "compilation_unit.h"
#include "compiler.h"
#include "dalvik_reg.h"
#include "greenland/inferred_reg_category_map.h"
#include "ir_builder.h"
+#include "llvm_compilation_unit.h"
#include "mirror/object.h"
#include "oat_compilation_unit.h"
#include "object_utils.h"
@@ -46,7 +46,7 @@ namespace compiler_llvm {
using namespace runtime_support;
-MethodCompiler::MethodCompiler(CompilationUnit* cunit,
+MethodCompiler::MethodCompiler(LlvmCompilationUnit* cunit,
Compiler* compiler,
OatCompilationUnit* oat_compilation_unit)
: cunit_(cunit), compiler_(compiler),