--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java	2019-05-03 14:53:04.252464759 +0200
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java	2019-05-03 14:53:04.021463644 +0200
@@ -83,15 +83,16 @@
   // _identity_hash is a short
   private static CIntegerField idHash;
 
-  public int identityHash() {
+  public long identityHash() {
     long addr_value = getAddress().asLongValue();
-    int  addr_bits = (int)(addr_value >> (VM.getVM().getLogMinObjAlignmentInBytes() + 3));
+    long addr_bits =
+      (addr_value >> (VM.getVM().getLogMinObjAlignmentInBytes() + 3)) & 0xffffffffL;
     int  length = (int)getLength();
     int  byte0 = getByteAt(0);
     int  byte1 = getByteAt(1);
-    int  id_hash = (int)(0xffff & idHash.getValue(this.addr));
-    return id_hash |
-           ((addr_bits ^ (length << 8) ^ ((byte0 << 8) | byte1)) << 16);
+    long id_hash = 0xffffL & (long)idHash.getValue(this.addr);
+    return (id_hash |
+      ((addr_bits ^ (length << 8) ^ ((byte0 << 8) | byte1)) << 16)) & 0xffffffffL;
   }
 
   public boolean equals(byte[] modUTF8Chars) {
--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	2019-05-03 14:53:04.952468141 +0200
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	2019-05-03 14:53:04.720467020 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,8 @@
     return HashtableEntry.class;
   }
 
-  public int computeHash(Symbol name) {
-    return (int) name.identityHash();
+  public long computeHash(Symbol name) {
+    return name.identityHash();
   }
 
   public int hashToIndex(long fullHash) {
--- old/test/hotspot/jtreg/ProblemList-cds-mode.txt	2019-05-03 14:53:05.670471609 +0200
+++ new/test/hotspot/jtreg/ProblemList-cds-mode.txt	2019-05-03 14:53:05.419470397 +0200
@@ -27,5 +27,3 @@
 #
 #############################################################################
 
-serviceability/sa/TestInstanceKlassSize.java                    8204308   generic-all
-serviceability/sa/TestInstanceKlassSizeForInterface.java        8204308   generic-all
--- old/test/hotspot/jtreg/ProblemList.txt	2019-05-03 14:53:06.384475058 +0200
+++ new/test/hotspot/jtreg/ProblemList.txt	2019-05-03 14:53:06.150473928 +0200
@@ -88,6 +88,7 @@
 serviceability/sa/ClhsdbAttach.java 8193639 solaris-all
 serviceability/sa/ClhsdbCDSCore.java 8207832 linux-x64
 serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/CDSJMapClstats.java 8193639 solaris-all
 serviceability/sa/ClhsdbField.java 8193639 solaris-all
 serviceability/sa/ClhsdbFindPC.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
 serviceability/sa/ClhsdbFlags.java 8193639 solaris-all