8308856: jdk.internal.classfile.impl.EntryMap::nextPowerOfTwo math problem

asotona · asotona · commit a6109bf1ea2a · 2023-06-01T11:50:20.000Z
Reviewed-by: jlahoda
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
@@ -174,8 +174,7 @@ private void rehash(final int newCapacity) {
     }
 
     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 ) {

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ private void rehash(final int newCapacity) {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`public static long nextPowerOfTwo( long x ) {`
`177`		`- x = -1 >>> Long.numberOfLeadingZeros(x - 1);`
`178`		`- return x + 1;`
	`177`	`+ return 1L << -Long.numberOfLeadingZeros(x - 1);`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`public static int arraySize( final int expected, final float f ) {`