From 23f1d24742de26b12172dc94fa214a9e890c3744 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 20 Oct 2006 21:43:36 +0000 Subject: [PATCH] natevents.cc (do_callback_arg_tests): Correctly pass jvalues. * testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests): Correctly pass jvalues. From-SVN: r117913 --- libjava/ChangeLog | 5 +++++ libjava/testsuite/libjava.jvmti/natevents.cc | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9dc48337bfef..21ec84739687 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-10-20 Tom Tromey + + * testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests): + Correctly pass jvalues. + 2006-10-18 Tom Tromey Bryce McKinlay diff --git a/libjava/testsuite/libjava.jvmti/natevents.cc b/libjava/testsuite/libjava.jvmti/natevents.cc index 2945e233bd2e..40e06bd5fbac 100644 --- a/libjava/testsuite/libjava.jvmti/natevents.cc +++ b/libjava/testsuite/libjava.jvmti/natevents.cc @@ -498,14 +498,18 @@ do_callback_arg_tests () _Jv_JVMTI_PostEvent (JVMTI_EVENT_FIELD_ACCESS, (jthread) 0x2, (JNIEnv *) 0x1, (jmethodID) 0x3, (jlocation) 0x4, (jclass) 0x5, (jobject) 0x6, (jfieldID) 0x7); + jvalue value; + value.l = (jobject) 0x9; _Jv_JVMTI_PostEvent (JVMTI_EVENT_FIELD_MODIFICATION, (jthread) 0x2, (JNIEnv *) 0x1, (jmethodID) 0x3, (jlocation) 0x4, (jclass) 0x5, (jobject) 0x6, (jfieldID) 0x7, - (int) '8', (/*jvalue*/ jobject) 0x9); + (int) '8', value); _Jv_JVMTI_PostEvent (JVMTI_EVENT_METHOD_ENTRY, (jthread) 0x2, (JNIEnv *) 0x1, (jmethodID) 0x3); + jvalue value2; + value2.i = 5; _Jv_JVMTI_PostEvent (JVMTI_EVENT_METHOD_EXIT, (jthread) 0x2, - (JNIEnv *) 0x1, (jmethodID) 0x3, 4, /*jvalue*/ 5); + (JNIEnv *) 0x1, (jmethodID) 0x3, 4, value2); _Jv_JVMTI_PostEvent (JVMTI_EVENT_NATIVE_METHOD_BIND, (jthread) 0x2, (JNIEnv *) 0x1, (jmethodID) 0x3, (void *) 0x4, (void **) 0x5);