jvmti.cc (_Jv_JVMTI_GetArgumentsSize): Make wide type arrays count as a sigle slot.

2007-03-12  Kyle Galloway  <kgallowa@redhat.com>

	* jvmti.cc (_Jv_JVMTI_GetArgumentsSize): Make wide type arrays count
	as a sigle slot.

From-SVN: r122863
This commit is contained in:
Kyle Galloway 2007-03-12 20:12:47 +00:00 committed by Kyle Galloway
parent 80ca80e9cc
commit b389f63b05
2 changed files with 12 additions and 1 deletions

View file

@ -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> 2007-03-12 Marco Trudel <mtrudel@gmx.ch>
* java/lang/natString.cc (getBytes (jstring enc)): * java/lang/natString.cc (getBytes (jstring enc)):

View file

@ -1111,7 +1111,13 @@ _Jv_JVMTI_GetArgumentsSize (jvmtiEnv *env, jmethodID method, jint *size)
|| sig[i] == 'I' || sig[i] == 'F') || sig[i] == 'I' || sig[i] == 'F')
num_slots++; num_slots++;
else if (sig[i] == 'J' || sig[i] == 'D') 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') else if (sig[i] == 'L')
{ {
num_slots++; num_slots++;