commit df739841b781dbd49c247e3795696389c4799020
author Vladimir Marko <vmarko@google.com> Wed Mar 23 16:59:07 2016 +0000
committer Vladimir Marko <vmarko@google.com> Thu Mar 24 09:29:18 2016 +0000
tree 0e7dfce8d23f22aac9bf2b2849a087f36d5f58c3
parent f8a3dea642fe638f54d181b7ca280b79ee519398

Post-Quick cleanup: Remove CompilationUnit.

Change-Id: I309411b0fffaaed1e218e2c34394bdf6e2f75b48

compiler/optimizing/optimizing_compiler.cc

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index f1c5581..ada5879 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -259,8 +259,7 @@
   explicit OptimizingCompiler(CompilerDriver* driver);
   ~OptimizingCompiler();
 
-  bool CanCompileMethod(uint32_t method_idx, const DexFile& dex_file, CompilationUnit* cu) const
-      OVERRIDE;
+  bool CanCompileMethod(uint32_t method_idx, const DexFile& dex_file) const OVERRIDE;
 
   CompiledMethod* Compile(const DexFile::CodeItem* code_item,
                           uint32_t access_flags,
@@ -283,8 +282,6 @@
         InstructionSetPointerSize(GetCompilerDriver()->GetInstructionSet())));
   }
 
-  void InitCompilationUnit(CompilationUnit& cu) const OVERRIDE;
-
   void Init() OVERRIDE;
 
   void UnInit() const OVERRIDE;
@@ -365,12 +362,8 @@
   }
 }
 
-void OptimizingCompiler::InitCompilationUnit(CompilationUnit& cu ATTRIBUTE_UNUSED) const {
-}
-
 bool OptimizingCompiler::CanCompileMethod(uint32_t method_idx ATTRIBUTE_UNUSED,
-                                          const DexFile& dex_file ATTRIBUTE_UNUSED,
-                                          CompilationUnit* cu ATTRIBUTE_UNUSED) const {
+                                          const DexFile& dex_file ATTRIBUTE_UNUSED) const {
   return true;
 }
 
@@ -662,9 +655,15 @@
   }
 
   DexCompilationUnit dex_compilation_unit(
-    nullptr, class_loader, Runtime::Current()->GetClassLinker(), dex_file, code_item,
-    class_def_idx, method_idx, access_flags,
-    nullptr, dex_cache);
+      class_loader,
+      Runtime::Current()->GetClassLinker(),
+      dex_file,
+      code_item,
+      class_def_idx,
+      method_idx,
+      access_flags,
+      /* verified_method */ nullptr,
+      dex_cache);
 
   bool requires_barrier = dex_compilation_unit.IsConstructor()
       && compiler_driver->RequiresConstructorBarrier(Thread::Current(),