From 11bac7a1ae225bf39a46df8ab33fdccfcec7478b Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 17 Feb 2000 00:54:34 +0000
Subject: [PATCH] 	* jni.cc (_Jv_JNI_CallStaticMethodV): Added some
 assertions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32021 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog | 2 ++
 libjava/jni.cc    | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2675540..ac3afaa 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 38f89d3..51b7b19 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);
 }
 
-- 
2.7.4