Fix build

liachmodded · Sep 16, 2024 · 6117a5b · 6117a5b
1 parent 54379a2
commit 6117a5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -242,7 +242,7 @@ private void inflate() {
             int singleBytes = JLA.countPositives(rawBytes, offset, rawLen);
             int hash = ArraysSupport.hashCodeOfUnsigned(rawBytes, offset, singleBytes, 0);
             if (singleBytes == rawLen) {
-                this.contentHash = hashString(hash);
+                this.contentHash = hash;
                 charLen = rawLen;
                 state = State.BYTE;
             }
@@ -300,7 +300,7 @@ private void inflate() {
                             throw new CpException("malformed input around byte " + px);
                     }
                 }
-                this.contentHash = hashString(hash);
+                this.contentHash = hash;
                 charLen = chararr_count;
                 this.chars = chararr;
                 state = State.CHAR;

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
@@ -544,8 +544,9 @@ AbstractPoolEntry.ClassEntryImpl cloneClassEntry(AbstractPoolEntry.ClassEntryImp
             return ce;
         }
 
+        var utf8 = maybeCloneUtf8Entry(e.ref1); // call order matters
         return internalAdd(new AbstractPoolEntry.ClassEntryImpl(this, size,
-                maybeCloneUtf8Entry(e.ref1), e.hashCode(), e.sym));
+                utf8, e.hashCode(), e.sym));
     }
 
     @Override