From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7134 invoked by alias); 5 Aug 2006 01:28:18 -0000 Received: (qmail 7125 invoked by uid 22791); 5 Aug 2006 01:28:17 -0000 X-Spam-Check-By: sourceware.org Received: from 105-193-189-207.dyn.peakpeak.com (HELO localhost.localdomain) (207.189.193.105) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 05 Aug 2006 01:28:15 +0000 Received: from localhost.localdomain (opsy [127.0.0.1]) by localhost.localdomain (8.13.7/8.13.7) with ESMTP id k751NeOt014740; Fri, 4 Aug 2006 19:23:41 -0600 Received: (from tromey@localhost) by localhost.localdomain (8.13.7/8.13.7/Submit) id k751NdRK014737; Fri, 4 Aug 2006 19:23:39 -0600 To: Andreas Schwab Cc: Java Patch List Subject: Re: Patch: FYI: jvmti additions References: From: Tom Tromey Reply-To: tromey@redhat.com X-Attribution: Tom Date: Sat, 05 Aug 2006 01:28:00 -0000 In-Reply-To: Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2006-q3/txt/msg00275.txt.bz2 >>>>> "Andreas" == Andreas Schwab 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 * 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;