--- old/src/hotspot/share/classfile/sharedClassUtil.cpp 2018-03-26 09:40:00.194185552 +0900 +++ new/src/hotspot/share/classfile/sharedClassUtil.cpp 2018-03-26 09:39:59.859182702 +0900 @@ -186,7 +186,7 @@ void SharedClassUtil::read_extra_data(const char* filename, TRAPS) { HashtableTextDump reader(filename); - reader.check_version("VERSION: 1.0"); + reader.check_version(HASHTABLE_VERSION); while (reader.remain() > 0) { int utf8_length; --- old/src/hotspot/share/classfile/stringTable.cpp 2018-03-26 09:40:00.880191389 +0900 +++ new/src/hotspot/share/classfile/stringTable.cpp 2018-03-26 09:40:00.546188547 +0900 @@ -444,7 +444,7 @@ the_table()->print_table_statistics(st, "StringTable"); } else { Thread* THREAD = Thread::current(); - st->print_cr("VERSION: 1.1"); + st->print_cr(HASHTABLE_VERSION); for (int i = 0; i < the_table()->table_size(); ++i) { HashtableEntry* p = the_table()->bucket(i); for ( ; p != NULL; p = p->next()) { --- old/src/hotspot/share/classfile/symbolTable.cpp 2018-03-26 09:40:01.561197182 +0900 +++ new/src/hotspot/share/classfile/symbolTable.cpp 2018-03-26 09:40:01.227194341 +0900 @@ -567,7 +567,7 @@ if (!verbose) { the_table()->print_table_statistics(st, "SymbolTable"); } else { - st->print_cr("VERSION: 1.0"); + st->print_cr(HASHTABLE_VERSION); for (int i = 0; i < the_table()->table_size(); ++i) { HashtableEntry* p = the_table()->bucket(i); for ( ; p != NULL; p = p->next()) { --- old/src/hotspot/share/utilities/hashtable.hpp 2018-03-26 09:40:02.243202985 +0900 +++ new/src/hotspot/share/utilities/hashtable.hpp 2018-03-26 09:40:01.907200126 +0900 @@ -31,6 +31,9 @@ #include "oops/symbol.hpp" #include "runtime/handles.hpp" +// Version for StringTable and SymbolTable +#define HASHTABLE_VERSION "VERSION: 1.1" + // This is a generic hashtable, designed to be used for the symbol // and string tables. // --- old/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_1.txt 2018-03-26 09:40:03.199211119 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_1.txt 2018-03-26 09:40:02.865208277 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: Symbol 0 -1: 41 -1: (Ljava/util/Set;Ljava/lang/Object;)V --- old/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_3.txt 2018-03-26 09:40:04.597223013 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_3.txt 2018-03-26 09:40:04.169219371 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: Symbol 11 -1: linkMethod 18 -1: isAlphaNumericString --- old/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.symbols.txt 2018-03-26 09:40:06.096234587 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.symbols.txt 2018-03-26 09:40:05.684232261 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: Symbol 69 -1: ------------------------------------------------------------123456789 68 -1: # The values in this file are only used for testing the operation of --- old/test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.config.txt 2018-03-26 09:40:07.737231820 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.config.txt 2018-03-26 09:40:07.373232434 +0900 @@ -1,3 +1,3 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 26: shared_string_from_MyInner --- old/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStress.config.txt 2018-03-26 09:40:09.048229610 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStress.config.txt 2018-03-26 09:40:08.632230311 +0900 @@ -1,3 +1,3 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 25: GCStressApp_shared_string --- old/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java 2018-03-26 09:40:10.348227418 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java 2018-03-26 09:40:09.982228035 +0900 @@ -68,7 +68,7 @@ System.getProperty("user.dir") + File.separator + "GCSharedStringDuringDump_gen.txt"; try (FileOutputStream fos = new FileOutputStream(sharedArchiveCfgFile)) { PrintWriter out = new PrintWriter(new OutputStreamWriter(fos)); - out.println("VERSION: 1.0"); + out.println("VERSION: 1.1"); out.println("@SECTION: String"); out.println("31: shared_test_string_unique_14325"); for (int i=0; i<100000; i++) { --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExtraSharedInput.txt 2018-03-26 09:40:11.561225372 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExtraSharedInput.txt 2018-03-26 09:40:11.219225949 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: Symbol 0 -1: 41 -1: (Ljava/util/Set;Ljava/lang/Object;)V --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.txt 2018-03-26 09:40:12.754223361 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.txt 2018-03-26 09:40:12.418223927 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java 2018-03-26 09:40:13.985221285 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java 2018-03-26 09:40:13.635221875 +0900 @@ -45,7 +45,7 @@ String sharedArchiveConfigFile = System.getProperty("user.dir") + File.separator + "SharedStringsStress_gen.txt"; try (FileOutputStream fos = new FileOutputStream(sharedArchiveConfigFile)) { PrintWriter out = new PrintWriter(new OutputStreamWriter(fos)); - out.println("VERSION: 1.0"); + out.println("VERSION: 1.1"); out.println("@SECTION: String"); out.println("31: shared_test_string_unique_14325"); for (int i=0; i<100000; i++) { --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt 2018-03-26 09:40:15.214219213 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt 2018-03-26 09:40:14.857219815 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 SECTION: String 0: 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidDataType.txt 2018-03-26 09:40:16.525217002 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidDataType.txt 2018-03-26 09:40:16.077217757 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidString.txt 2018-03-26 09:40:19.753211559 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidString.txt 2018-03-26 09:40:18.613213481 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 31: shred_test_string_unique_14325 31: shared_test_string_intern_12345 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt 2018-03-26 09:40:21.418208751 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt 2018-03-26 09:40:21.015209431 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5:: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt 2018-03-26 09:40:23.366205467 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt 2018-03-26 09:40:22.946206175 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt 2018-03-26 09:40:24.723203178 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt 2018-03-26 09:40:24.363203785 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt 2018-03-26 09:40:26.312200499 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt 2018-03-26 09:40:25.974201069 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 2147483648: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/TruncatedString.txt 2018-03-26 09:40:27.579198363 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/TruncatedString.txt 2018-03-26 09:40:27.219198970 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 2147483647: s 5: cp819 --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt 2018-03-26 09:40:28.947196056 +0900 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt 2018-03-26 09:40:28.578196678 +0900 @@ -1,4 +1,4 @@ -VERSION: 1.0 +VERSION: 1.1 @SECTION: String 0: 5: cp819