Ensure that all redefinition created dex file get on classpath
We were not adding some DexFiles to the ClassPath if there were
multiple classes from the same classloader being redefined at the same
time. We fixed this issue and made a test for it.
Test: mma -j40 test-art-host
Change-Id: I6e8961c8602367ebec5d5a948d71e58f3be2f6d7
diff --git a/runtime/openjdkjvmti/ti_class_loader.h b/runtime/openjdkjvmti/ti_class_loader.h
index 17ed0eb..1ac4988 100644
--- a/runtime/openjdkjvmti/ti_class_loader.h
+++ b/runtime/openjdkjvmti/ti_class_loader.h
@@ -82,9 +82,12 @@
art::Thread* self, art::Handle<art::mirror::ClassLoader> loader)
REQUIRES_SHARED(art::Locks::mutator_lock_);
+ static art::ObjPtr<art::mirror::LongArray> GetDexFileCookie(
+ art::Handle<art::mirror::Object> java_dex_file) REQUIRES_SHARED(art::Locks::mutator_lock_);
+
static art::ObjPtr<art::mirror::LongArray> AllocateNewDexFileCookie(
art::Thread* self,
- art::Handle<art::mirror::Object> java_dex_file,
+ art::Handle<art::mirror::LongArray> old_dex_file_cookie,
const art::DexFile* new_dex_file) REQUIRES_SHARED(art::Locks::mutator_lock_);
static void UpdateJavaDexFile(art::ObjPtr<art::mirror::Object> java_dex_file,