commit 40381fb9dc4b4cf274f1e58b2cdf4396202c6189
author Brian Carlstrom <bdc@google.com> Wed Oct 19 14:13:40 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 20 12:19:25 2011 -0700
tree 8281b105d3e8a0850984f0ee182db01c33613f27
parent b06631143b944388fc68bedf6679c006dde5f461

Reuse SIRT for C++ references

Change-Id: I8310e55da42f55f7ec60f6b17face436c77a979f

src/class_linker.h

diff --git a/src/class_linker.h b/src/class_linker.h
index f14b770..12d7b37 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -28,6 +28,7 @@
 #include "mutex.h"
 #include "oat_file.h"
 #include "object.h"
+#include "stack_indirect_reference_table.h"
 #include "unordered_map.h"
 #include "unordered_set.h"
 
@@ -196,7 +197,7 @@
   void RunRootClinits();
 
   void RegisterDexFile(const DexFile& dex_file);
-  void RegisterDexFile(const DexFile& dex_file, DexCache* dex_cache);
+  void RegisterDexFile(const DexFile& dex_file, SirtRef<DexCache>& dex_cache);
 
   const std::vector<const DexFile*>& GetBootClassPath() {
     return boot_class_path_;
@@ -274,7 +275,7 @@
                           const ClassLoader* class_loader);
 
   void AppendToBootClassPath(const DexFile& dex_file);
-  void AppendToBootClassPath(const DexFile& dex_file, DexCache* dex_cache);
+  void AppendToBootClassPath(const DexFile& dex_file, SirtRef<DexCache>& dex_cache);
 
   void ConstructFieldMap(const DexFile& dex_file, const DexFile::ClassDef& dex_class_def,
       Class* c, std::map<int, Field*>& field_map);
@@ -284,28 +285,28 @@
 
   void LoadClass(const DexFile& dex_file,
                  const DexFile::ClassDef& dex_class_def,
-                 Class* klass,
+                 SirtRef<Class>& klass,
                  const ClassLoader* class_loader);
 
   void LoadInterfaces(const DexFile& dex_file,
                       const DexFile::ClassDef& dex_class_def,
-                      Class *klass);
+                      SirtRef<Class>& klass);
 
   void LoadField(const DexFile& dex_file,
                  const DexFile::Field& dex_field,
-                 Class* klass,
-                 Field* dst);
+                 SirtRef<Class>& klass,
+                 SirtRef<Field>& dst);
 
   void LoadMethod(const DexFile& dex_file,
                   const DexFile::Method& dex_method,
-                  Class* klass,
-                  Method* dst);
+                  SirtRef<Class>& klass,
+                  SirtRef<Method>& dst);
 
   // Inserts a class into the class table.  Returns true if the class
   // was inserted.
   bool InsertClass(const std::string& descriptor, Class* klass);
 
-  void RegisterDexFileLocked(const DexFile& dex_file, DexCache* dex_cache);
+  void RegisterDexFileLocked(const DexFile& dex_file, SirtRef<DexCache>& dex_cache);
   bool IsDexFileRegisteredLocked(const DexFile& dex_file) const;
 
   bool InitializeClass(Class* klass, bool can_run_clinit);
@@ -322,26 +323,26 @@
                                       const Class* klass1,
                                       const Class* klass2);
 
-  bool LinkClass(Class* klass);
+  bool LinkClass(SirtRef<Class>& klass);
 
-  bool LinkSuperClass(Class* klass);
+  bool LinkSuperClass(SirtRef<Class>& klass);
 
-  bool LoadSuperAndInterfaces(Class* klass, const DexFile& dex_file);
+  bool LoadSuperAndInterfaces(SirtRef<Class>& klass, const DexFile& dex_file);
 
-  bool LinkMethods(Class* klass);
+  bool LinkMethods(SirtRef<Class>& klass);
 
-  bool LinkVirtualMethods(Class* klass);
+  bool LinkVirtualMethods(SirtRef<Class>& klass);
 
-  bool LinkInterfaceMethods(Class* klass);
+  bool LinkInterfaceMethods(SirtRef<Class>& klass);
 
-  bool LinkStaticFields(Class* klass);
-  bool LinkInstanceFields(Class* klass);
-  bool LinkFields(Class *klass, bool is_static);
+  bool LinkStaticFields(SirtRef<Class>& klass);
+  bool LinkInstanceFields(SirtRef<Class>& klass);
+  bool LinkFields(SirtRef<Class>& klass, bool is_static);
 
 
-  void CreateReferenceInstanceOffsets(Class* klass);
-  void CreateReferenceStaticOffsets(Class* klass);
-  void CreateReferenceOffsets(Class *klass, bool is_static,
+  void CreateReferenceInstanceOffsets(SirtRef<Class>& klass);
+  void CreateReferenceStaticOffsets(SirtRef<Class>& klass);
+  void CreateReferenceOffsets(SirtRef<Class>& klass, bool is_static,
                               uint32_t reference_offsets);
 
   // For use by ImageWriter to find DexCaches for its roots
@@ -351,8 +352,8 @@
 
   const OatFile* FindOpenedOatFile(const std::string& location);
 
-  Method* CreateProxyConstructor(Class* klass);
-  Method* CreateProxyMethod(Class* klass, Method* prototype, ObjectArray<Class>* throws);
+  Method* CreateProxyConstructor(SirtRef<Class>& klass);
+  Method* CreateProxyMethod(SirtRef<Class>& klass, SirtRef<Method>& prototype, ObjectArray<Class>* throws);
 
   std::vector<const DexFile*> boot_class_path_;