1.1 --- a/src/share/vm/classfile/symbolTable.hpp Tue Sep 23 17:24:34 2014 -0700
1.2 +++ b/src/share/vm/classfile/symbolTable.hpp Fri Aug 29 13:08:01 2014 +0200
1.3 @@ -74,7 +74,7 @@
1.4 operator Symbol*() { return _temp; }
1.5 };
1.6
1.7 -class SymbolTable : public Hashtable<Symbol*, mtSymbol> {
1.8 +class SymbolTable : public RehashableHashtable<Symbol*, mtSymbol> {
1.9 friend class VMStructs;
1.10 friend class ClassFileParser;
1.11
1.12 @@ -110,10 +110,10 @@
1.13 Symbol* lookup(int index, const char* name, int len, unsigned int hash);
1.14
1.15 SymbolTable()
1.16 - : Hashtable<Symbol*, mtSymbol>(SymbolTableSize, sizeof (HashtableEntry<Symbol*, mtSymbol>)) {}
1.17 + : RehashableHashtable<Symbol*, mtSymbol>(SymbolTableSize, sizeof (HashtableEntry<Symbol*, mtSymbol>)) {}
1.18
1.19 SymbolTable(HashtableBucket<mtSymbol>* t, int number_of_entries)
1.20 - : Hashtable<Symbol*, mtSymbol>(SymbolTableSize, sizeof (HashtableEntry<Symbol*, mtSymbol>), t,
1.21 + : RehashableHashtable<Symbol*, mtSymbol>(SymbolTableSize, sizeof (HashtableEntry<Symbol*, mtSymbol>), t,
1.22 number_of_entries) {}
1.23
1.24 // Arena for permanent symbols (null class loader) that are never unloaded
1.25 @@ -252,7 +252,7 @@
1.26 static int parallel_claimed_index() { return _parallel_claimed_idx; }
1.27 };
1.28
1.29 -class StringTable : public Hashtable<oop, mtSymbol> {
1.30 +class StringTable : public RehashableHashtable<oop, mtSymbol> {
1.31 friend class VMStructs;
1.32
1.33 private:
1.34 @@ -278,11 +278,11 @@
1.35 // in the range [start_idx, end_idx).
1.36 static void buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, int* processed, int* removed);
1.37
1.38 - StringTable() : Hashtable<oop, mtSymbol>((int)StringTableSize,
1.39 + StringTable() : RehashableHashtable<oop, mtSymbol>((int)StringTableSize,
1.40 sizeof (HashtableEntry<oop, mtSymbol>)) {}
1.41
1.42 StringTable(HashtableBucket<mtSymbol>* t, int number_of_entries)
1.43 - : Hashtable<oop, mtSymbol>((int)StringTableSize, sizeof (HashtableEntry<oop, mtSymbol>), t,
1.44 + : RehashableHashtable<oop, mtSymbol>((int)StringTableSize, sizeof (HashtableEntry<oop, mtSymbol>), t,
1.45 number_of_entries) {}
1.46 public:
1.47 // The string table
