* Merged with default branch at rev 16f3633aaa5a.

[cacao.git] / src / vm / vm.c

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 1ba3ebb69ff9cada72e26a08e494b6385e502075..aefd786077bea9c30e9d44edf4e277d091ee34c2 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -741,6 +741,9 @@ bool vm_createjvm(JavaVM **p_vm, void **p_env, void *vm_args)
 #if defined(ENABLE_JNI)
        /* setup the local ref table (must be created after vm_create) */
 
+       /* XXX this one will never get freed for the main thread;
+          call localref_table_destroy() if you want to do it! */
+
        if (!localref_table_init())
                goto error;
 #endif
@@ -1623,6 +1626,10 @@ bool vm_create(JavaVMInitArgs *vm_args)
 #endif
 
 #if defined(ENABLE_JVMTI)
+# if defined(ENABLE_GC_CACAO)
+       /* XXX this will not work with the new indirection cells for classloaders!!! */
+       assert(0);
+# endif
        if (jvmti) {
                /* add agent library to native library hashtable */
                native_hashtable_library_add(utf_new_char(libname), class_java_lang_Object->classloader, handle);