Avoid throwing NoClassDefFoundError at compile time.
Change-Id: I8ba56a8750e1718babcb1f94e0408d89f58ea9b5
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index b4c767d..0110b36 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1290,6 +1290,11 @@
return klass;
}
+bool ClassLinker::IsInBootClassPath(const char* descriptor) {
+ DexFile::ClassPathEntry pair = DexFile::FindInClassPath(descriptor, boot_class_path_);
+ return pair.second != NULL;
+}
+
mirror::Class* ClassLinker::FindSystemClass(const char* descriptor) {
return FindClass(descriptor, NULL);
}
@@ -1320,18 +1325,17 @@
}
} else if (Runtime::Current()->UseCompileTimeClassPath()) {
- // first try the boot class path
- mirror::Class* system_class = FindSystemClass(descriptor);
- if (system_class != NULL) {
+ // First try the boot class path, we check the descriptor first to avoid an unnecessary
+ // throw of a NoClassDefFoundError.
+ if (IsInBootClassPath(descriptor)) {
+ mirror::Class* system_class = FindSystemClass(descriptor);
+ CHECK(system_class != NULL);
return system_class;
}
- CHECK(self->IsExceptionPending());
- self->ClearException();
-
- // next try the compile time class path
+ // Next try the compile time class path.
const std::vector<const DexFile*>* class_path;
{
- ScopedObjectAccessUnchecked soa(Thread::Current());
+ ScopedObjectAccessUnchecked soa(self);
ScopedLocalRef<jobject> jclass_loader(soa.Env(), soa.AddLocalReference<jobject>(class_loader));
class_path = &Runtime::Current()->GetCompileTimeClassPath(jclass_loader.get());
}
@@ -2697,7 +2701,6 @@
Thread* self = Thread::Current();
- mirror::ArtMethod* clinit = NULL;
{
// see JLS 3rd edition, 12.4.2 "Detailed Initialization Procedure" for the locking protocol
ObjectLock lock(self, klass);
@@ -2722,8 +2725,6 @@
}
}
- clinit = klass->FindDeclaredDirectMethod("<clinit>", "()V");
-
// If the class is kStatusInitializing, either this thread is
// initializing higher up the stack or another thread has beat us
// to initializing and we need to wait. Either way, this
@@ -2770,6 +2771,7 @@
bool has_static_field_initializers = InitializeStaticFields(klass, can_init_statics);
+ mirror::ArtMethod* clinit = klass->FindDeclaredDirectMethod("<clinit>", "()V");
if (clinit != NULL && can_run_clinit) {
if (Runtime::Current()->IsStarted()) {
JValue result;
@@ -2779,7 +2781,7 @@
}
}
- // Opportunistically set static method trampolines to their destiniation. Unless initialization
+ // Opportunistically set static method trampolines to their destination. Unless initialization
// is being hindered at compile time.
if (can_init_statics || can_run_clinit || (!has_static_field_initializers && clinit == NULL)) {
FixupStaticTrampolines(klass);
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index fdf17a2..624b7ce 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -62,6 +62,8 @@
~ClassLinker();
+ bool IsInBootClassPath(const char* descriptor);
+
// Finds a class by its descriptor, loading it if necessary.
// If class_loader is null, searches boot_class_path_.
mirror::Class* FindClass(const char* descriptor, mirror::ClassLoader* class_loader)