diff --git a/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
index 55f937f033331..de5d8fc673998 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
@@ -103,7 +103,7 @@ public static DLSID read(RIFFReader riff) throws IOException {
 
         @Override
         public int hashCode() {
-            return (int)i1;
+            return Long.hashCode(i1);
         }
 
         @Override
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
index 179fd8d9b7675..d56d4d6242d36 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021, 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
@@ -91,7 +91,7 @@ public static GUID read(RIFFReader riff) throws IOException {
 
         @Override
         public int hashCode() {
-            return (int) i1;
+            return Long.hashCode(i1);
         }
 
         @Override
diff --git a/src/java.rmi/share/classes/java/rmi/server/ObjID.java b/src/java.rmi/share/classes/java/rmi/server/ObjID.java
index f0bbc10ec4050..335123b8e95df 100644
--- a/src/java.rmi/share/classes/java/rmi/server/ObjID.java
+++ b/src/java.rmi/share/classes/java/rmi/server/ObjID.java
@@ -199,8 +199,9 @@ public static ObjID read(ObjectInput in) throws IOException {
      *
      * @return  the hash code value for this object identifier
      */
+    @Override
     public int hashCode() {
-        return (int) objNum;
+        return Long.hashCode(objNum);
     }
 
     /**
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 9d189797a6b64..6599cb45d1cd5 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, 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
@@ -175,7 +175,7 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return (int) getMetaspaceMethod();
+        return Long.hashCode(getMetaspaceMethod());
     }
 
     /**
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java
index aa5e6ba6ae8b9..1c3e83c152149 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -51,8 +51,9 @@ public boolean equals(Object obj) {
         }
     }
 
+    @Override
     public int hashCode() {
-        return (int)ref();
+        return Long.hashCode(ref());
     }
 
     public int compareTo(Field field) {
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java
index 33bbd3b0c1d41..35a646ae49575 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -95,8 +95,9 @@ public boolean equals(Object obj) {
         }
     }
 
+    @Override
     public int hashCode() {
-        return (int)ref();
+        return Long.hashCode(ref());
     }
 
     public final List<Location> allLineLocations()
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
index 31ad7e483208d..3438ee1090694 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -155,8 +155,9 @@ public boolean equals(Object obj) {
         }
     }
 
+    @Override
     public int hashCode() {
-        return(int)ref();
+        return Long.hashCode(ref());
     }
 
     public Type type() {
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
index 3c3be9adbe6a6..26e4f7e84f2b9 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -152,8 +152,9 @@ public boolean equals(Object obj) {
         }
     }
 
+    @Override
     public int hashCode() {
-        return(int)ref();
+        return Long.hashCode(ref());
     }
 
     public int compareTo(ReferenceType object) {
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java
index 22c186a4989c5..59d318b1a3067 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, 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
@@ -100,7 +100,8 @@ public boolean equals(Object o) {
      *
      * @return a hash code for this {@code NTNumericCredential}.
      */
+    @Override
     public int hashCode() {
-        return (int)this.impersonationToken;
+        return Long.hashCode(this.impersonationToken);
     }
 }