commit af3572bc21cf66f970090c852b976095bb028083
author Nicolas Geoffray <ngeoffray@google.com> Wed Nov 02 09:49:25 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Nov 02 09:49:25 2016 +0000
tree 597b436db28186864524d5208628082e52a5ff52
parent fd1ae75a03b0b17fdbbb0097e856f494edf12312

Revert "ART: Generalize FindClassInPathClassLoader"

Bug: 32510706

This reverts commit fd1ae75a03b0b17fdbbb0097e856f494edf12312.

Change-Id: Ie247477eea44a6a241d90864bf5dca29897ff4b8

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 4426056..3248d0e 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -794,17 +794,17 @@
 
   void FixupStaticTrampolines(ObjPtr<mirror::Class> klass) REQUIRES_SHARED(Locks::mutator_lock_);
 
-  // Finds a class in a Path- or DexClassLoader, loading it if necessary without using JNI. Hash
+  // Finds a class in the path class loader, loading it if necessary without using JNI. Hash
   // function is supposed to be ComputeModifiedUtf8Hash(descriptor). Returns true if the
   // class-loader chain could be handled, false otherwise, i.e., a non-supported class-loader
   // was encountered while walking the parent chain (currently only BootClassLoader and
   // PathClassLoader are supported).
-  bool FindClassInBaseDexClassLoader(ScopedObjectAccessAlreadyRunnable& soa,
-                                     Thread* self,
-                                     const char* descriptor,
-                                     size_t hash,
-                                     Handle<mirror::ClassLoader> class_loader,
-                                     ObjPtr<mirror::Class>* result)
+  bool FindClassInPathClassLoader(ScopedObjectAccessAlreadyRunnable& soa,
+                                  Thread* self,
+                                  const char* descriptor,
+                                  size_t hash,
+                                  Handle<mirror::ClassLoader> class_loader,
+                                  ObjPtr<mirror::Class>* result)
       REQUIRES_SHARED(Locks::mutator_lock_)
       REQUIRES(!dex_lock_);
 
@@ -1200,7 +1200,7 @@
   friend struct CompilationHelper;  // For Compile in ImageTest.
   friend class ImageDumper;  // for DexLock
   friend class ImageWriter;  // for GetClassRoots
-  friend class VMClassLoader;  // for LookupClass and FindClassInBaseDexClassLoader.
+  friend class VMClassLoader;  // for LookupClass and FindClassInPathClassLoader.
   friend class JniCompilerTest;  // for GetRuntimeQuickGenericJniStub
   friend class JniInternalTest;  // for GetRuntimeQuickGenericJniStub
   ART_FRIEND_TEST(ClassLinkerTest, RegisterDexFileName);  // for DexLock, and RegisterDexFileLocked