procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/21703 (hang when rapidly calling String.intern())

Browse source 
PR libgcj/21703:
	* java/lang/ref/natReference.cc (find_slot): Handle case where
	table has no NULL entries.
	* java/lang/natString.cc (_Jv_StringFindSlot): Handle case where
	table has no NULL entries.

From-SVN: r100153
This commit is contained in:
Tom Tromey 2005-05-25 15:23:56 +00:00 • committed by Tom Tromey
parent 56c0cf75a0
commit 93f8e21b71
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/java/lang/ref/natReference.cc
View file

@ -1,6 +1,6 @@
// natReference.cc - Native code for References
/* Copyright (C) 2001, 2002, 2003 Free Software Foundation
/* Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
This file is part of libgcj.
@ -78,7 +78,7 @@ find_slot (jobject key)
int start_index = hcode & (hash_size - 1);
int index = start_index;
int deleted_index = -1;
for (;;)
do
{
object_list *ptr = &hash[index];
if (ptr->reference == key)
@ -96,8 +96,12 @@ find_slot (jobject key)
JvAssert (ptr->reference == DELETED_REFERENCE);
}
index = (index + step) & (hash_size - 1);
JvAssert (index != start_index);
}
while (index != start_index);
// Note that we can have INDEX == START_INDEX if the table has no
// NULL entries but does have DELETED entries.
JvAssert (deleted_index >= 0);
return &hash[deleted_index];
}
static void