diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jvmti.cc | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ef215ef..02a20c2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-03-12 Kyle Galloway <kgallowa@redhat.com> + + * jvmti.cc (_Jv_JVMTI_GetArgumentsSize): Make wide type arrays count + as a sigle slot. + 2007-03-12 Marco Trudel <mtrudel@gmx.ch> * java/lang/natString.cc (getBytes (jstring enc)): diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index 0688787..e9fa0a2 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -1111,7 +1111,13 @@ _Jv_JVMTI_GetArgumentsSize (jvmtiEnv *env, jmethodID method, jint *size) || sig[i] == 'I' || sig[i] == 'F') num_slots++; else if (sig[i] == 'J' || sig[i] == 'D') - num_slots+=2; + { + // If this is an array of wide types it uses a single slot + if (i > 0 && sig[i-1] == '[') + num_slots++; + else + num_slots += 2; + } else if (sig[i] == 'L') { num_slots++; |