diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/jcf-io.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 09e7978d942..ce90e28f791 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2014-06-24 Trevor Saunders <tsaunders@mozilla.com> + + * jcf-io.c: Adjust. + 2014-06-11 Jan Hubicka <hubicka@ucw.cz> * java/class.c (build_utf8_ref): Update handling for section names diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 7491882254d..358fc1e47c1 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -299,7 +299,7 @@ charstar_hash::equal (const value_type *existing, const compare_type *candidate) during class lookup. (There is no need to cache the values associated with names that were found; they are saved in IDENTIFIER_CLASS_VALUE.) */ -static hash_table <charstar_hash> memoized_class_lookups; +static hash_table<charstar_hash> *memoized_class_lookups; /* Returns a freshly malloc'd string with the fully qualified pathname of the .class file for the class CLASSNAME. CLASSNAME must be @@ -321,13 +321,13 @@ find_class (const char *classname, int classname_length, JCF *jcf) hashval_t hash; /* Create the hash table, if it does not already exist. */ - if (!memoized_class_lookups.is_created ()) - memoized_class_lookups.create (37); + if (!memoized_class_lookups) + memoized_class_lookups = new hash_table<charstar_hash> (37); /* Loop for this class in the hashtable. If it is present, we've already looked for this class and failed to find it. */ hash = charstar_hash::hash (classname); - if (memoized_class_lookups.find_with_hash (classname, hash)) + if (memoized_class_lookups->find_with_hash (classname, hash)) return NULL; /* Allocate and zero out the buffer, since we don't explicitly put a @@ -402,7 +402,7 @@ find_class (const char *classname, int classname_length, JCF *jcf) /* Remember that this class could not be found so that we do not have to look again. */ - *memoized_class_lookups.find_slot_with_hash (classname, hash, INSERT) + *memoized_class_lookups->find_slot_with_hash (classname, hash, INSERT) = classname; return NULL; |