Removed return value from descriptor_params_from_paramtypes.

[cacao.git] / src / vm / loader.cpp

diff --git a/src/vm/loader.cpp b/src/vm/loader.cpp
index 9ff93a4aa527601af3b90c97b4180b271a1585ba..0dc53d0c0330602339dbad0aae5934ce9589e5a0 100644 (file)
--- a/src/vm/loader.cpp
+++ b/src/vm/loader.cpp
@@ -1,6 +1,6 @@
 /* src/vm/loader.cpp - class loader functions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2011
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
    Copyright (C) 2009 Theobroma Systems Ltd.
 
@@ -229,8 +229,10 @@ void loader_init(void)
        class_java_util_Vector                 = load_class_bootstrap(utf_java_util_Vector);
 
 # if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-       class_sun_misc_Signal                  = load_class_bootstrap(utf_new_char("sun/misc/Signal"));
-       class_sun_reflect_MagicAccessorImpl    = load_class_bootstrap(utf_new_char("sun/reflect/MagicAccessorImpl"));
+       class_sun_misc_Signal                     = load_class_bootstrap(utf_new_char("sun/misc/Signal"));
+       class_sun_reflect_MagicAccessorImpl       = load_class_bootstrap(utf_new_char("sun/reflect/MagicAccessorImpl"));
+       class_sun_reflect_MethodAccessorImpl      = load_class_bootstrap(utf_new_char("sun/reflect/MethodAccessorImpl"));
+       class_sun_reflect_ConstructorAccessorImpl = load_class_bootstrap(utf_new_char("sun/reflect/ConstructorAccessorImpl"));
 # endif
 
        arrayclass_java_lang_Object =
@@ -1591,7 +1593,6 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
        /* allocate space for the parsed descriptors */
 
        descriptor_pool_alloc_parsed_descriptors(descpool);
-       c->parseddescs = (u1*) descriptor_pool_get_parsed_descriptors(descpool, &(c->parseddescsize));
 
 #if defined(ENABLE_STATISTICS)
        if (opt_stat) {
@@ -2136,8 +2137,7 @@ classinfo *load_newly_created_array(classinfo *c, classloader_t *loader)
 
        /* parse the descriptor to get the register allocation */
 
-       if (!descriptor_params_from_paramtypes(clonedesc, clone->flags))
-               return false;
+       descriptor_params_from_paramtypes(clonedesc, clone->flags);
 
        clone->code = NativeStub::generate(clone, BUILTIN_clone);
 
@@ -2146,8 +2146,6 @@ classinfo *load_newly_created_array(classinfo *c, classloader_t *loader)
        /* array classes are not loaded from class files */
 
        c->state          |= CLASS_LOADED;
-       c->parseddescs    = (u1 *) clonedesc;
-       c->parseddescsize = sizeof(methodinfo);
        c->classrefs      = classrefs;
        c->classrefcount  = 1;