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/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index fc02a49..3f56aab 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -297,14 +297,6 @@
     return 0;
   }
 
-  const ClassLoader* AllocPathClassLoader(const DexFile* dex_file) {
-    CHECK(dex_file != NULL);
-    class_linker_->RegisterDexFile(*dex_file);
-    std::vector<const DexFile*> dex_files;
-    dex_files.push_back(dex_file);
-    return PathClassLoader::AllocCompileTime(dex_files);
-  }
-
   const DexFile* OpenTestDexFile(const char* name) {
     CHECK(name != NULL);
     std::string filename;
@@ -320,17 +312,17 @@
     return dex_file;
   }
 
-  const ClassLoader* LoadDex(const char* dex_name) {
+  ClassLoader* LoadDex(const char* dex_name) {
     const DexFile* dex_file = OpenTestDexFile(dex_name);
     CHECK(dex_file != NULL);
     loaded_dex_files_.push_back(dex_file);
     class_linker_->RegisterDexFile(*dex_file);
     std::vector<const DexFile*> class_path;
     class_path.push_back(dex_file);
-    const ClassLoader* class_loader = PathClassLoader::AllocCompileTime(class_path);
-    CHECK(class_loader != NULL);
-    Thread::Current()->SetClassLoaderOverride(class_loader);
-    return class_loader;
+    SirtRef<ClassLoader> class_loader(PathClassLoader::AllocCompileTime(class_path));
+    CHECK(class_loader.get() != NULL);
+    Thread::Current()->SetClassLoaderOverride(class_loader.get());
+    return class_loader.get();
   }
 
   void CompileClass(const ClassLoader* class_loader, const char* class_name) {
@@ -353,7 +345,7 @@
     MakeExecutable(runtime_->GetJniStubArray());
   }
 
-  void CompileDirectMethod(const ClassLoader* class_loader,
+  void CompileDirectMethod(ClassLoader* class_loader,
                            const char* class_name,
                            const char* method_name,
                            const char* signature) {
@@ -366,7 +358,7 @@
     CompileMethod(method);
   }
 
-  void CompileVirtualMethod(const ClassLoader* class_loader,
+  void CompileVirtualMethod(ClassLoader* class_loader,
                             const char* class_name,
                             const char* method_name,
                             const char* signature) {