Fix test 086-classloader
Clean up method signature verification.
Correct ensure initialized to return false only when exceptions are
pending.
Change-Id: Ib8c2e788ed16e08975138e7ef363ba9435c4cfcd
diff --git a/src/class_linker.h b/src/class_linker.h
index 7d94e95..45b1aa2 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -347,13 +347,13 @@
bool InitializeSuperClass(Class* klass, bool can_run_clinit);
void InitializeStaticFields(Class* klass);
- bool HasSameDescriptorClasses(const char* descriptor,
- const Class* klass1,
- const Class* klass2);
+ bool IsSameDescriptorInDifferentClassContexts(const char* descriptor,
+ const Class* klass1,
+ const Class* klass2);
- bool HasSameMethodDescriptorClasses(const Method* descriptor,
- const Class* klass1,
- const Class* klass2);
+ bool IsSameMethodSignatureInDifferentClassContexts(const Method* descriptor,
+ const Class* klass1,
+ const Class* klass2);
bool LinkClass(SirtRef<Class>& klass, ObjectArray<Class>* interfaces);