[multiple changes]

1999-08-09  Anthony Green  <green@cygnus.com>

        * gij.cc: New file.

        * include/config.h.in: Rebuilt.
        * acconfig.h: Add INTERPRETER.

        * configure: Rebuilt.

        * Makefile.in: Rebuilt.
        * Makefile.am (libffi_files): Identify the libffi object files for
        inclusion in libgcj.
        (LIBFFIINCS): Define.

        * interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
        Dummy definition for configurations without an interpreter.

        * java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
        java::lang::Boolean constructor.

        * include/java-interp.h: Always include java-cpool.h.

        * java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
        when INTERPRETER not defined.

        * java/lang/Class.h (finalize): Define.

        * gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
        IOException from File.getCanonicalPath.
        (getStream): Likewise.

        * NEWS: More news.
        * THANKS: More thanks.

1999-08-09  Kresten Krab Thorup  <krab@gnu.org>

        * resolve.cc (get_ffi_type_from_signature): Generate uint16 for
        jchar type.
        (_Jv_PrepareClass): Allow non-abstract classes to
        have abstract subclasses.
        (_Jv_ResolvePoolEntry): Revert subclass check for protected
        fields and methods.
        * interpret.cc (continue1/perform_invoke): Don't sign extend
        uint16 return val.
        (continue1/lshl,lshr): Push long, not int.
        (continue1/ulshr): Use UINT64, not long long.
        * defineclass.cc (handleFieldsEnd): Handle case when all fields
        are static.
        * java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
        * java/lang/FirstThread.java (run): Add top-level exception
        handler.
        (run0): Renamed from run.

1999-08-08  Kresten Krab Thorup  <krab@gnu.org>

        * configure.in (--with-interpreter): Added.
        * include/config.h.in (INTERPRETER): Added.

        * java/lang/ClassLoader.java: File replaced.
        * java/lang/VMClassLoader.java: New file.
        * java/lang/natClassLoader.cc: New file.
        * gnu/gcj/runtime/MethodInvocation.java: New file.
        * gnu/gcj/util/path/SearchPath.java: New file.
        * gnu/gcj/util/path/PathEntry.java: New file.
        * gnu/gcj/util/path/DirectoryPathEntry.java: New file.
        * gnu/gcj/util/path/ZipPathEntry.java: New file.
        * gnu/gcj/util/path/URLPathEntry.java: New file.
        * gnu/gcj/util/path/CacheEntry.java: New file.
        * include/java-interp.h: New file.
        * include/java-cpool.h: New file.
        * include/java-insns.h: New file.
        * defineclass.cc: New file.
        * interpret.cc: New file.
        * resolve.cc: New file.

        * java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
        _Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
        _Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
        (finalize): New.
        (STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
        STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
        prefix.
        (initializeClass): Use new JV_ prefixed names.  Also, call
        ClassLoader::resolveClass instead of _Jv_ResolveClass.

        * java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
        JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
        JV_STATE_LINKED): New.
        (_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
        _Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
        (_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
        _Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
        _Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
        _Jv_InterpMethodInvocation): New friends for interpreter.
        (finalize): New.
        (CONSTANT_Class, CONSTANT_String, etc.): Moved to
        include/java-cpool.h and renamed with JV_ prefix.

        * include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
        decls.
        (_Jv_UnregisterClass): New decl.

        * java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
        class loader argument.
        (_Jv_FindClass): Use class loader.

        * prims.cc (_Jv_makeUtf8Const): New function.
        (_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
        (_Jv_NewPrimArray): Ditto.
        (_Jv_FindClassFromSignature): Ditto.
        * java/lang/reflect/natArray.cc (newInstance): Ditto.
        * java/lang/reflect/natMethod.cc (getType): Ditto.

        * include/java-field.h (_Jv_Field::isRef): Make robust for
        non-resolved contexts.

        * boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
        Also, don't mark class->next field.

        * java/lang/VirtualMachineError.java: Added FIXME note.

        * configure.in (INTERPSPEC): New spec.
        * libgcj.spec.in: Added INTERPSPEC.
        * Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
        gnu/gcj/runtime/MethodInvocation.
        (libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
        (ordinary_java_source_files): Added above mentioned java classes.

        * configure: Rebuilt.
        * Makefile.in: Rebuilt.

From-SVN: r28597

1 files changed, 624 insertions, 0 deletions

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
new file mode 100644
index 0000000..13452ec
--- /dev/null
+++ b/libjava/java/lang/natClassLoader.cc
@@ -0,0 +1,624 @@
+// natClassLoader.cc - Implementation of java.lang.ClassLoader native methods.
+
+/* Copyright (C) 1999  Cygnus Solutions
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+/* Author: Kresten Krab Thorup <krab@gnu.org>  */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cni.h>
+#include <jvm.h>
+#include <java/lang/Character.h>
+#include <java/lang/Thread.h>
+#include <java/lang/ClassLoader.h>
+#include <java/lang/VMClassLoader.h>
+#include <java/lang/InternalError.h>
+#include <java/lang/LinkageError.h>
+#include <java/lang/ClassFormatError.h>
+#include <java/lang/NoClassDefFoundError.h>
+#include <java/lang/ClassNotFoundException.h>
+#include <java/lang/ClassCircularityError.h>
+#include <java/lang/IncompatibleClassChangeError.h>
+#include <java/lang/reflect/Modifier.h>
+
+#include <java-interp.h>
+
+#define CloneableClass _CL_Q34java4lang9Cloneable
+extern java::lang::Class CloneableClass;
+#define ObjectClass _CL_Q34java4lang6Object
+extern java::lang::Class ObjectClass;
+#define ClassClass _CL_Q34java4lang5Class
+extern java::lang::Class ClassClass;
+#define VMClassLoaderClass _CL_Q34java4lang17VMClassLoader
+extern java::lang::Class VMClassLoader;
+#define ClassLoaderClass _CL_Q34java4lang11ClassLoader
+extern java::lang::Class ClassLoaderClass;
+
+/////////// java.lang.ClassLoader native methods ////////////
+
+#ifdef INTERPRETER
+java::lang::VMClassLoader *redirect = 0;
+#endif
+
+java::lang::ClassLoader*
+java::lang::ClassLoader::getVMClassLoader0 ()
+{
+#ifdef INTERPRETER
+    if (redirect == 0)
+	redirect = new java::lang::VMClassLoader;
+    return redirect;
+#else
+    return 0;
+#endif
+}
+
+void
+java::lang::ClassLoader::defineClass2 (jclass klass, jbyteArray data,
+				       jint offset, jint length)
+{
+#ifdef INTERPRETER
+  _Jv_DefineClass (klass, data, offset, length);
+#endif
+}
+
+java::lang::Class *
+java::lang::ClassLoader::defineClass0 (jstring name,
+				       jbyteArray data, 
+				       jint offset,
+				       jint length)
+{
+#ifdef INTERPRETER
+  jclass klass;
+  klass = (jclass) JvAllocObject (&ClassClass, sizeof (_Jv_InterpClass));
+
+  // synchronize on the class, so that it is not
+  // attempted initialized until we're done loading.
+  _Jv_MonitorEnter (klass);
+
+  // record which is the defining loader
+  klass->loader = this;
+
+  // register that we are the initiating loader...
+  if (name != 0)
+    {
+      _Jv_Utf8Const *   name2 = _Jv_makeUtf8Const (name);
+
+      _Jv_VerifyClassName (name2);
+
+      klass->name = name2;
+    }
+
+  // this will do the magic.  loadInto also operates
+  // as an exception trampoline for now...
+  Throwable *ex = defineClass1 (klass, data, offset, length);
+    
+  if (ex)  // we failed to load it
+    {
+      klass->state = JV_STATE_ERROR;
+      klass->notifyAll ();
+
+      _Jv_UnregisterClass (klass);
+
+      _Jv_MonitorExit (klass);
+	  
+      // FIXME: Here we may want to test that EX does
+      // indeed represent a valid exception.  That is,
+      // anything but ClassNotFoundException, 
+      // or some kind of Error.
+	  
+      JvThrow (ex);
+    }
+    
+  // if everything proceeded sucessfully, we're loaded.
+  JvAssert (klass->state == JV_STATE_LOADED);
+
+  // if an exception is generated, this is initially missed.
+  // however, we come back here in handleException0 below...
+  _Jv_MonitorExit (klass);
+
+  return klass;
+
+#else // INTERPRETER
+
+  return 0;
+#endif
+}
+
+void
+_Jv_WaitForState (jclass klass, int state)
+{
+  if (klass->state >= state)
+    return;
+  
+  _Jv_MonitorEnter (klass) ;
+
+  if (state == JV_STATE_LINKED)
+    {
+      _Jv_MonitorExit (klass);
+      _Jv_InternClassStrings (klass);
+      return;
+    }
+	
+  java::lang::Thread *self = java::lang::Thread::currentThread();
+
+  // this is similar to the strategy for class initialization.
+  // if we already hold the lock, just leave.
+  while (klass->state <= state
+	 && klass->thread 
+	 && klass->thread != self)
+    klass->wait ();
+
+  _Jv_MonitorExit (klass);
+
+  if (klass->state == JV_STATE_ERROR)
+    {
+      _Jv_Throw (new java::lang::LinkageError ());
+    }
+}
+
+// Finish linking a class.  Only called from ClassLoader::resolveClass.
+void
+java::lang::ClassLoader::linkClass0 (java::lang::Class *klass)
+{
+  if (klass->state >= JV_STATE_LINKED)
+    return;
+
+#ifdef INTERPRETER
+  if (_Jv_IsInterpretedClass (klass))
+    {
+      _Jv_PrepareClass (klass);
+    }
+#endif
+
+  _Jv_InternClassStrings (klass);
+}
+
+void
+java::lang::ClassLoader::markClassErrorState0 (java::lang::Class *klass)
+{
+  klass->state = JV_STATE_ERROR;
+  klass->notifyAll ();
+}
+
+
+/** this is the only native method in VMClassLoader, so 
+    we define it here. */
+jclass
+java::lang::VMClassLoader::findBootClass (jstring name)
+{
+  return _Jv_FindClassInCache (_Jv_makeUtf8Const (name), 0);
+}
+
+jclass
+java::lang::ClassLoader::findLoadedClass (jstring name)
+{
+  return _Jv_FindClassInCache (_Jv_makeUtf8Const (name), this);
+}
+
+jclass
+java::lang::ClassLoader::findSystemClass (jstring name)
+{
+  return _Jv_FindClass (_Jv_makeUtf8Const (name), 0);
+}
+
+
+/* This is the final step of linking, internalizing the constant strings
+ * of a class.  This is called for both compiled and interpreted
+ * classes, and it is *only* called from ClassLoader::linkClass0,
+ * which is always in a context where the current thread has a lock on
+ * the class in question.  We define it here, and not in resolve.cc, so that
+ * the entire resolve.cc can be #ifdef'ed away when not using the
+ * interpreter.   */
+void
+_Jv_InternClassStrings(jclass klass)
+{
+  if (klass->state >= JV_STATE_LINKED)
+    return;
+
+  // short-circuit, so that mutually dependent classes are ok
+  klass->state = JV_STATE_LINKED;
+
+  _Jv_Constants *pool = &klass->constants;
+  for (int i = 1; i < pool->size; ++i)
+    {
+      if (pool->tags[i] == JV_CONSTANT_String)
+	{
+	  jstring str;
+	  str = _Jv_NewStringUtf8Const ((_Jv_Utf8Const *) pool->data[i]);
+	  pool->data[i] = (void *) str;
+	  pool->tags[i] |= JV_CONSTANT_ResolvedFlag;
+	}
+    }
+
+  klass->notifyAll ();
+}
+
+
+//
+//  A single class can have many "initiating" class loaders,
+//  and a single "defining" class loader.  The Defining
+//  class loader is what is returned from Class.getClassLoader()
+//  and is used when loading dependent classes during resolution.
+//  The set of initiating class loaders are used to ensure
+//  safety of linking, and is maintained in the hash table
+//  "initiated_classes".  A defining classloader is by definition also
+//  initiating, so we only store classes in this table, if they have more
+//  than one class loader associated.
+//
+
+
+// Size of local hash table.
+#define HASH_LEN 1013
+
+// Hash function for Utf8Consts.
+#define HASH_UTF(Utf) (((Utf)->hash) % HASH_LEN)
+
+struct _Jv_LoaderInfo {
+    _Jv_LoaderInfo          *next;
+    java::lang::Class       *klass;
+    java::lang::ClassLoader *loader;
+};
+
+_Jv_LoaderInfo *initiated_classes[HASH_LEN];
+jclass loaded_classes[HASH_LEN];
+
+jclass
+_Jv_FindClassInCache (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
+{
+  _Jv_MonitorEnter (&ClassClass);
+  jint hash = HASH_UTF (name);
+
+  // first, if LOADER is a defining loader, then it is also initiating
+  jclass klass;
+  for (klass = loaded_classes[hash]; klass; klass = klass->next)
+    {
+      if (loader == klass->loader && _Jv_equalUtf8Consts (name, klass->name))
+	break;
+    }
+
+  // otherwise, it may be that the class in question was defined
+  // by some other loader, but that the loading was initiated by 
+  // the loader in question.
+  if (!klass)
+    {
+      _Jv_LoaderInfo *info;
+      for (info = initiated_classes[hash]; info; info = info->next)
+	{
+	  if (loader == info->loader
+	      && _Jv_equalUtf8Consts (name, info->klass->name))
+	    {
+	      klass = info->klass;
+	      break;
+	    }
+	}
+    }
+
+  _Jv_MonitorExit (&ClassClass);
+
+  return klass;
+}
+
+void
+_Jv_UnregisterClass (jclass the_class)
+{
+  _Jv_MonitorEnter (&ClassClass);
+  jint hash = HASH_UTF(the_class->name);
+
+  jclass *klass = &(loaded_classes[hash]);
+  for ( ; *klass; klass = &((*klass)->next))
+    {
+      if (*klass == the_class)
+	{
+	  *klass = (*klass)->next;
+	  break;
+	}
+    }
+
+  _Jv_LoaderInfo **info = &(initiated_classes[hash]);
+  for ( ; *info; info = &((*info)->next))
+    {
+      while ((*info)->klass == the_class)
+	{
+	  *info = (*info)->next;
+	}
+    }
+
+  _Jv_MonitorExit (&ClassClass);
+}
+
+void
+_Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
+{
+  _Jv_LoaderInfo *info = new _Jv_LoaderInfo; // non-gc alloc!
+  jint hash = HASH_UTF(klass->name);
+
+  _Jv_MonitorEnter (&ClassClass);
+  info->loader = loader;
+  info->klass  = klass;
+  info->next   = initiated_classes[hash];
+  initiated_classes[hash] = info;
+  _Jv_MonitorExit (&ClassClass);
+  
+}
+
+// This function is called many times during startup, before main() is
+// run.  We do our runtime initialization here the very first time we
+// are called.  At that point in time we know for certain we are
+// running single-threaded, so we don't need to lock when modifying
+// `init'.  CLASSES is NULL-terminated.
+void
+_Jv_RegisterClasses (jclass *classes)
+{
+  static bool init = false;
+
+  if (! init)
+    {
+      init = true;
+      _Jv_InitThreads ();
+      _Jv_InitGC ();
+      _Jv_InitializeSyncMutex ();
+    }
+
+  JvSynchronize sync (&ClassClass);
+  for (; *classes; ++classes)
+    {
+      jclass klass = *classes;
+      jint hash = HASH_UTF (klass->name);
+      klass->next = loaded_classes[hash];
+      loaded_classes[hash] = klass;
+
+      // registering a compiled class causes
+      // it to be immediately "prepared".  
+      if (klass->state == JV_STATE_NOTING)
+	klass->state = JV_STATE_COMPILED;
+    }
+}
+
+void
+_Jv_RegisterClass (jclass klass)
+{
+  jclass classes[2];
+  classes[0] = klass;
+  classes[1] = NULL;
+  _Jv_RegisterClasses (classes);
+}
+
+#if 0
+// NOTE: this one is out of date with the new loader stuff...
+jclass
+_Jv_FindClassInCache (jstring name, java::lang::ClassLoader *loader)
+{
+  JvSynchronize sync (&ClassClass);
+  jint hash = name->hashCode();
+  jclass klass = loaded_classes[(_Jv_ushort) hash % HASH_LEN];
+  for ( ; klass; klass = klass->next)
+    {
+      if (loader == klass->loader
+	  && _Jv_equal (klass->name, name, hash))
+	break;
+    }
+  _Jv_MonitorExit (&ClassClass);
+  return klass;
+}
+#endif
+
+jclass _Jv_FindClass (_Jv_Utf8Const *name,
+		      java::lang::ClassLoader *loader)
+{
+  jclass klass = _Jv_FindClassInCache (name, loader);
+
+#ifdef INTERPRETER
+  if (! klass)
+    {
+      jstring sname = _Jv_NewStringUTF (name->data);
+
+      if (loader)
+	{
+	  // Load using a user-defined loader, jvmspec 5.3.2
+	  klass = loader->loadClass(sname, false);
+
+	  // if "loader" delegateted the loadClass operation
+	  // to another loader, register explicitly
+	  // that he is also an initiating loader of the
+	  // given class.  	  
+
+	  if (klass && (klass->getClassLoader () != loader))
+	    _Jv_RegisterInitiatingLoader (klass, 0);
+	}
+      else 
+	{
+	  if (redirect == NULL)
+	    {
+	      _Jv_InitClass (&ClassLoaderClass);
+	      java::lang::ClassLoader::getSystemClassLoader ();
+	    }
+
+	  // Load using the bootstrap loader jmspec 5.3.1
+	  klass = redirect -> loadClassInternal (sname, false, true); 
+
+	  // register that we're an initiating loader
+	  if (klass)
+	    {
+	      _Jv_RegisterInitiatingLoader (klass, 0);
+	    }
+	}
+    }
+  else
+    {
+      // we need classes to be in the hash while
+      // we're loading, so that they can refer to themselves. 
+      _Jv_WaitForState (klass, JV_STATE_LOADED);
+    }
+#endif
+
+  return klass;
+}
+
+#if 0
+// NOTE: this one is out of date with the new class loader stuff...
+jclass
+_Jv_FindClass (jstring name, java::lang::ClassLoader *loader)
+{
+  jclass klass = _Jv_FindClassInCache (name, loader);
+  if (! klass)
+    {
+      if (loader)
+	{
+	  klass = loader->loadClass(name);
+	}
+      else
+	{
+	  // jmspec 5.3.1.2
+	  
+	  // delegate to the system loader
+	  klass = java::lang::ClassLoader::system.loadClass (sname);
+	  
+	  // register that we're an initiating loader
+	  if (klass)
+	    _Jv_RegisterInitiatingLoader (klass, 0);
+	}
+    }
+  else
+    {
+      _Jv_WaitForState (klass, JV_STATE_LOADED);
+    }
+  
+  return klass;
+}
+#endif
+
+jclass
+_Jv_NewClass (_Jv_Utf8Const *name, jclass superclass,
+	      java::lang::ClassLoader *loader)
+{
+  jclass ret = (jclass) JvAllocObject (&ClassClass);
+
+  ret->next = NULL;
+  ret->name = name;
+  ret->accflags = 0;
+  ret->superclass = superclass;
+  ret->constants.size = 0;
+  ret->constants.tags = NULL;
+  ret->constants.data = NULL;
+  ret->methods = NULL;
+  ret->method_count = 0;
+  ret->vtable_method_count = 0;
+  ret->fields = NULL;
+  ret->size_in_bytes = 0;
+  ret->field_count = 0;
+  ret->static_field_count = 0;
+  ret->vtable = NULL;
+  ret->interfaces = NULL;
+  ret->loader = loader;
+  ret->interface_count = 0;
+  ret->state = 0;
+  ret->thread = NULL;
+
+  _Jv_RegisterClass (ret);
+
+  return ret;
+}
+
+jclass
+_Jv_FindArrayClass (jclass element, java::lang::ClassLoader *loader)
+{
+  _Jv_Utf8Const *array_name;
+  int len;
+  if (element->isPrimitive())
+    {
+      // For primitive types the array is cached in the class.
+      jclass ret = (jclass) element->methods;
+      if (ret)
+	return ret;
+      len = 3;
+    }
+  else
+    len = element->name->length + 5;
+
+  {
+    char signature[len];
+    int index = 0;
+    signature[index++] = '[';
+    // Compute name of array class to see if we've already cached it.
+    if (element->isPrimitive())
+      {
+	signature[index++] = (char) element->method_count;
+      }
+    else
+      {
+	size_t length = element->name->length;
+	const char *const name = element->name->data;
+	if (name[0] != '[')
+	  signature[index++] = 'L';
+	memcpy (&signature[index], name, length);
+	index += length;
+	if (name[0] != '[')
+	  signature[index++] = ';';
+      }      
+    array_name = _Jv_makeUtf8Const (signature, index);
+  }
+
+  jclass array_class = _Jv_FindClassInCache (array_name, element->loader);
+
+  if (! array_class)
+    {
+      // Create new array class.
+      array_class = _Jv_NewClass (array_name, &ObjectClass, element->loader);
+
+      // Note that `vtable_method_count' doesn't include the initial
+      // NULL slot.
+      int dm_count = ObjectClass.vtable_method_count + 1;
+
+      // Create a new vtable by copying Object's vtable (except the
+      // class pointer, of course).  Note that we allocate this as
+      // unscanned memory -- the vtables are handled specially by the
+      // GC.
+      int size = (sizeof (_Jv_VTable) +
+		  ((dm_count - 1) * sizeof (void *)));
+      _Jv_VTable *vtable = (_Jv_VTable *) _Jv_AllocBytes (size);
+      vtable->clas = array_class;
+      memcpy (vtable->method, ObjectClass.vtable->method,
+	      dm_count * sizeof (void *));
+      array_class->vtable = vtable;
+      array_class->vtable_method_count = ObjectClass.vtable_method_count;
+
+      // Stash the pointer to the element type.
+      array_class->methods = (_Jv_Method *) element;
+
+      // Register our interfaces.
+      // FIXME: for JDK 1.2 we need Serializable.
+      static jclass interfaces[] = { &CloneableClass };
+      array_class->interfaces = interfaces;
+      array_class->interface_count = 1;
+
+      // as per vmspec 5.3.3.2
+      array_class->accflags = element->accflags;
+
+      // FIXME: initialize other Class instance variables,
+      // e.g. `fields'.
+
+      // say this class is initialized and ready to go!
+      array_class->state = JV_STATE_DONE;
+
+      // vmspec, section 5.3.3 describes this
+      if (element->loader != loader)
+	_Jv_RegisterInitiatingLoader (array_class, loader);
+    }
+
+  // For primitive types, point back at this array.
+  if (element->isPrimitive())
+    element->methods = (_Jv_Method *) array_class;
+
+  return array_class;
+}
+
+