* src/native/vm/gnu/java_lang_reflect_Constructor.c

(getExceptionTypes): Implemented directly.
* src/native/vm/java_lang_reflect_Constructor.c (getExceptionTypes): Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.

diff --git a/src/native/vm/gnu/java_lang_reflect_Constructor.c b/src/native/vm/gnu/java_lang_reflect_Constructor.c
index 23e5db7c1f5484dd9f09f3a4fdc8337da9227219..98b5dec8282fc64b2e1d437e9e520796b5c6630b 100644 (file)
--- a/src/native/vm/gnu/java_lang_reflect_Constructor.c
+++ b/src/native/vm/gnu/java_lang_reflect_Constructor.c
@@ -63,7 +63,7 @@
 static JNINativeMethod methods[] = {
        { "getModifiersInternal",    "()I",                                                       (void *) (ptrint) &Java_java_lang_reflect_Constructor_getModifiersInternal    },
        { "getParameterTypes",       "()[Ljava/lang/Class;",                                      (void *) (ptrint) &Java_java_lang_reflect_Constructor_getParameterTypes       },
-       { "getExceptionTypes",       "()[Ljava/lang/Class;",                                      (void *) (ptrint) &_Jv_java_lang_reflect_Constructor_getExceptionTypes   },
+       { "getExceptionTypes",       "()[Ljava/lang/Class;",                                      (void *) (ptrint) &Java_java_lang_reflect_Constructor_getExceptionTypes       },
        { "constructNative",         "([Ljava/lang/Object;Ljava/lang/Class;I)Ljava/lang/Object;", (void *) (ptrint) &Java_java_lang_reflect_Constructor_constructNative    },
        { "getSignature",            "()Ljava/lang/String;",                                      (void *) (ptrint) &_Jv_java_lang_reflect_Constructor_getSignature        },
 #if defined(ENABLE_ANNOTATIONS)
@@ -129,6 +129,26 @@ JNIEXPORT java_handle_objectarray_t* JNICALL Java_java_lang_reflect_Constructor_
 }
 
 
+/*
+ * Class:     java/lang/reflect/Constructor
+ * Method:    getExceptionTypes
+ * Signature: ()[Ljava/lang/Class;
+ */
+JNIEXPORT java_handle_objectarray_t* JNICALL Java_java_lang_reflect_Constructor_getExceptionTypes(JNIEnv *env, java_lang_reflect_Constructor *this)
+{
+       classinfo  *c;
+       methodinfo *m;
+       int32_t     slot;
+
+       LLNI_field_get_cls(this, clazz, c);
+       LLNI_field_get_val(this, slot,  slot);
+
+       m = &(c->methods[slot]);
+
+       return method_get_exceptionarray(m);
+}
+
+
 /*
  * Class:     java/lang/reflect/Constructor
  * Method:    constructNative

diff --git a/src/native/vm/java_lang_reflect_Constructor.c b/src/native/vm/java_lang_reflect_Constructor.c
index 64e7465ec6ebbfa7d7611d583313b1290e365f23..3bccabf5a84d8b875869bfb865213e513bc7070c 100644 (file)
--- a/src/native/vm/java_lang_reflect_Constructor.c
+++ b/src/native/vm/java_lang_reflect_Constructor.c
@@ -61,25 +61,6 @@
 #include "vmcore/method.h"
 
 
-/*
- * Class:     java/lang/reflect/Constructor
- * Method:    getExceptionTypes
- * Signature: ()[Ljava/lang/Class;
- */
-java_handle_objectarray_t *_Jv_java_lang_reflect_Constructor_getExceptionTypes(JNIEnv *env, java_lang_reflect_Constructor *this)
-{
-       classinfo  *c;
-       methodinfo *m;
-       int32_t     slot;
-
-       LLNI_field_get_cls(this, clazz, c);
-       LLNI_field_get_val(this, slot , slot);
-       m = &(c->methods[slot]);
-
-       return method_get_exceptionarray(m);
-}
-
-
 /*
  * Class:     java/lang/reflect/Constructor
  * Method:    newInstance

diff --git a/src/native/vm/java_lang_reflect_Constructor.h b/src/native/vm/java_lang_reflect_Constructor.h
index a0a63692424d18b82a5d318440ae3d2e39708735..5d13e13025884726afb08dbdd9a5757217a3e30d 100644 (file)
--- a/src/native/vm/java_lang_reflect_Constructor.h
+++ b/src/native/vm/java_lang_reflect_Constructor.h
@@ -40,7 +40,6 @@
 
 /* function prototypes ********************************************************/
 
-java_handle_objectarray_t *_Jv_java_lang_reflect_Constructor_getExceptionTypes(JNIEnv *env, java_lang_reflect_Constructor *this);
 java_lang_Object          *_Jv_java_lang_reflect_Constructor_newInstance(JNIEnv *env, java_lang_reflect_Constructor *this, java_handle_objectarray_t *args);
 java_lang_String          *_Jv_java_lang_reflect_Constructor_getSignature(JNIEnv *env, java_lang_reflect_Constructor *this);