This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: FYI: jvmti additions
- From: Tom Tromey <tromey at redhat dot com>
- To: Andreas Schwab <schwab at suse dot de>
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 04 Aug 2006 19:23:39 -0600
- Subject: Re: Patch: FYI: jvmti additions
- References: <m34pwtkasi.fsf@localhost.localdomain> <jek65o26m4.fsf@sykes.suse.de>
- Reply-to: tromey at redhat dot com
>>>>> "Andreas" == Andreas Schwab <schwab@suse.de> writes:
>> I'm checking this in on the trunk.
Andreas> Doesn't build.
Sorry about that.
The appended should fix it; I'm checking this in.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* jvmti.cc: Added MAYBE_UNUSED to 'env' parameters.
(_Jv_JVMTI_GetObjectSize): Cast _Jv_GetArrayElementFromElementType
result to _Jv_uintptr_t.
Index: jvmti.cc
===================================================================
--- jvmti.cc (revision 115941)
+++ jvmti.cc (working copy)
@@ -215,7 +215,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetClassModifiers (jvmtiEnv *env, jclass klass, jint *mods)
+_Jv_JVMTI_GetClassModifiers (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jint *mods)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
// Don't bother checking KLASS' type.
@@ -227,8 +228,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetClassMethods (jvmtiEnv *env, jclass klass, jint *count_ptr,
- jmethodID **methods_ptr)
+_Jv_JVMTI_GetClassMethods (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jint *count_ptr, jmethodID **methods_ptr)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
// FIXME: capability can_maintain_original_method_order
@@ -249,7 +250,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_IsInterface (jvmtiEnv *env, jclass klass, jboolean *result)
+_Jv_JVMTI_IsInterface (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jboolean *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (klass == NULL)
@@ -260,7 +262,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_IsArrayClass (jvmtiEnv *env, jclass klass, jboolean *result)
+_Jv_JVMTI_IsArrayClass (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jboolean *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (klass == NULL)
@@ -271,7 +274,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetClassLoader (jvmtiEnv *env, jclass klass, jobject *result)
+_Jv_JVMTI_GetClassLoader (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jobject *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (klass == NULL)
@@ -282,7 +286,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetObjectHashCode (jvmtiEnv *env, jobject obj, jint *result)
+_Jv_JVMTI_GetObjectHashCode (MAYBE_UNUSED jvmtiEnv *env, jobject obj,
+ jint *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (obj == NULL)
@@ -293,8 +298,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetFieldModifiers (jvmtiEnv *env, jclass klass, jfieldID field,
- jint *result)
+_Jv_JVMTI_GetFieldModifiers (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jfieldID field, jint *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (klass == NULL)
@@ -307,8 +312,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_IsFieldSynthetic (jvmtiEnv *env, jclass klass, jfieldID field,
- jboolean *result)
+_Jv_JVMTI_IsFieldSynthetic (MAYBE_UNUSED jvmtiEnv *env, jclass klass,
+ jfieldID field, jboolean *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (klass == NULL)
@@ -324,7 +329,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetMethodModifiers (jvmtiEnv *env, jmethodID method, jint *result)
+_Jv_JVMTI_GetMethodModifiers (MAYBE_UNUSED jvmtiEnv *env, jmethodID method,
+ jint *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (method == NULL)
@@ -337,7 +343,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_IsMethodNative (jvmtiEnv *env, jmethodID method, jboolean *result)
+_Jv_JVMTI_IsMethodNative (MAYBE_UNUSED jvmtiEnv *env, jmethodID method,
+ jboolean *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (method == NULL)
@@ -349,7 +356,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_IsMethodSynthetic (jvmtiEnv *env, jmethodID method, jboolean *result)
+_Jv_JVMTI_IsMethodSynthetic (MAYBE_UNUSED jvmtiEnv *env, jmethodID method,
+ jboolean *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (method == NULL)
@@ -364,7 +372,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetClassLoaderClasses (jvmtiEnv *env,
+_Jv_JVMTI_GetClassLoaderClasses (MAYBE_UNUSED jvmtiEnv *env,
jobject init_loader,
jint *count_ptr,
jclass **result_ptr)
@@ -394,7 +402,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_ForceGarbageCollection (jvmtiEnv *env)
+_Jv_JVMTI_ForceGarbageCollection (MAYBE_UNUSED jvmtiEnv *env)
{
REQUIRE_PHASE (env, JVMTI_PHASE_LIVE);
_Jv_RunGC();
@@ -402,7 +410,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_SetJNIFunctionTable (jvmtiEnv *env,
+_Jv_JVMTI_SetJNIFunctionTable (MAYBE_UNUSED jvmtiEnv *env,
const jniNativeInterface *function_table)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
@@ -412,7 +420,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetJNIFunctionTable (jvmtiEnv *env,
+_Jv_JVMTI_GetJNIFunctionTable (MAYBE_UNUSED jvmtiEnv *env,
jniNativeInterface **function_table)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
@@ -432,7 +440,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetSystemProperty (jvmtiEnv *env, const char *property,
+_Jv_JVMTI_GetSystemProperty (MAYBE_UNUSED jvmtiEnv *env, const char *property,
char **result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_ONLOAD | JVMTI_PHASE_LIVE);
@@ -454,7 +462,7 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_SetSystemProperty (jvmtiEnv *env, const char *property,
+_Jv_JVMTI_SetSystemProperty (MAYBE_UNUSED jvmtiEnv *env, const char *property,
const char *value)
{
REQUIRE_PHASE (env, JVMTI_PHASE_ONLOAD);
@@ -494,7 +502,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_AddToBootstrapClassLoaderSearch (jvmtiEnv *env, const char *segment)
+_Jv_JVMTI_AddToBootstrapClassLoaderSearch (MAYBE_UNUSED jvmtiEnv *env,
+ const char *segment)
{
using namespace java::lang;
using namespace java::net;
@@ -542,7 +551,8 @@
}
static jvmtiError JNICALL
-_Jv_JVMTI_GetObjectSize (jvmtiEnv *env, jobject object, jlong *result)
+_Jv_JVMTI_GetObjectSize (MAYBE_UNUSED jvmtiEnv *env, jobject object,
+ jlong *result)
{
REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE);
if (object == NULL)
@@ -554,8 +564,8 @@
{
jclass comp = klass->getComponentType();
jint base
- = (jint) _Jv_GetArrayElementFromElementType(NULL,
- klass->getComponentType());
+ = (jint) (_Jv_uintptr_t) _Jv_GetArrayElementFromElementType(NULL,
+ klass->getComponentType());
// FIXME: correct for primitive types?
jint compSize = comp->size();
__JArray *array = (__JArray *) object;