From: Tom Tromey <tromey@cygnus.com>
Date: Thu, 17 Feb 2000 00:54:34 +0000 (+0000)
Subject: * jni.cc (_Jv_JNI_CallStaticMethodV): Added some assertions.
X-Git-Tag: prereleases/libstdc++-2.92~8172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ef57049f9a6cc27f909e73b0e4f41f3084c28a0;p=thirdparty%2Fgcc.git

* jni.cc (_Jv_JNI_CallStaticMethodV): Added some assertions.

From-SVN: r32021
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 267554093b02..ac3afaaee2d6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,7 @@
 2000-02-16  Tom Tromey  <tromey@cygnus.com>
 
+	* jni.cc (_Jv_JNI_CallStaticMethodV): Added some assertions.
+
 	* jni.cc (_Jv_JNI_NewObjectV): Corrected assertion.
 	(_Jv_JNI_NewObject): Likewise.
 	(_Jv_JNI_NewObjectA): Likewise.
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 38f89d368816..51b7b19f5a2a 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -756,6 +756,9 @@ static T
 _Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass,
 			   jmethodID id, va_list args)
 {
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   return _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, id, args);
 }
 
@@ -768,6 +771,9 @@ _Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, jmethodID id, ...)
   va_list args;
   T result;
 
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   va_start (args, id);
   result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass,
 						   id, args);
@@ -783,6 +789,9 @@ static T
 _Jv_JNI_CallStaticMethodA (JNIEnv *env, jclass klass, jmethodID id,
 			   jvalue *args)
 {
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   return _Jv_JNI_CallAnyMethodA<T, static_type> (env, NULL, klass, id, args);
 }