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/driver/dex_compilation_unit.cc

diff --git a/compiler/driver/dex_compilation_unit.cc b/compiler/driver/dex_compilation_unit.cc
index e458b98..b0ee448 100644
--- a/compiler/driver/dex_compilation_unit.cc
+++ b/compiler/driver/dex_compilation_unit.cc
@@ -22,8 +22,7 @@
 
 namespace art {
 
-DexCompilationUnit::DexCompilationUnit(CompilationUnit* cu,
-                                       jobject class_loader,
+DexCompilationUnit::DexCompilationUnit(jobject class_loader,
                                        ClassLinker* class_linker,
                                        const DexFile& dex_file,
                                        const DexFile::CodeItem* code_item,
@@ -32,8 +31,7 @@
                                        uint32_t access_flags,
                                        const VerifiedMethod* verified_method,
                                        Handle<mirror::DexCache> dex_cache)
-    : cu_(cu),
-      class_loader_(class_loader),
+    : class_loader_(class_loader),
       class_linker_(class_linker),
       dex_file_(&dex_file),
       code_item_(code_item),

compiler/driver/dex_compilation_unit.h

diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h
index 16872f4..854927d 100644
--- a/compiler/driver/dex_compilation_unit.h
+++ b/compiler/driver/dex_compilation_unit.h
@@ -30,15 +30,11 @@
 class DexCache;
 }  // namespace mirror
 class ClassLinker;
-struct CompilationUnit;
 class VerifiedMethod;
 
 class DexCompilationUnit : public DeletableArenaObject<kArenaAllocMisc> {
  public:
-  explicit DexCompilationUnit(CompilationUnit* cu);
-
-  DexCompilationUnit(CompilationUnit* cu,
-                     jobject class_loader,
+  DexCompilationUnit(jobject class_loader,
                      ClassLinker* class_linker,
                      const DexFile& dex_file,
                      const DexFile::CodeItem* code_item,
@@ -48,10 +44,6 @@
                      const VerifiedMethod* verified_method,
                      Handle<mirror::DexCache> dex_cache);
 
-  CompilationUnit* GetCompilationUnit() const {
-    return cu_;
-  }
-
   jobject GetClassLoader() const {
     return class_loader_;
   }
@@ -121,8 +113,6 @@
   }
 
  private:
-  CompilationUnit* const cu_;
-
   const jobject class_loader_;
 
   ClassLinker* const class_linker_;