diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java b/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
index bb54618ab31..4270dbf79a3 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
@@ -174,8 +174,7 @@ public abstract class EntryMap<T> {
     }
 
     public static long nextPowerOfTwo( long x ) {
-        x = -1 >>> Long.numberOfLeadingZeros(x - 1);
-        return x + 1;
+        return 1L << -Long.numberOfLeadingZeros(x - 1);
     }
 
     public static int arraySize( final int expected, final float f ) {