ibmruntimes · keithc-ca · Jul 19, 2024 · Jun 19, 2024 · Jun 19, 2024 · Jun 20, 2024
diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk
@@ -1 +1 @@
-OPENJDK_TAG := jdk-23+31
+OPENJDK_TAG := jdk-23+33
diff --git a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -107,7 +107,7 @@ public String toString(List<? extends DocTree> tags, Element element) {
             throw new RuntimeException(e);
         }
 
-        String simpleTypeName = element.getSimpleName().toString();
+        String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
         String imageFile = simpleTypeName + "-sealed-graph.svg";
         int thumbnailHeight = 100; // also appears in the stylesheet
         String hoverImage = "<span>"
@@ -315,14 +315,14 @@ private static Optional<String> packageName(TypeElement element) {
                 case MEMBER -> packageName((TypeElement) element.getEnclosingElement());
             };
         }
+    }
 
-        private static String packagelessCanonicalName(TypeElement element) {
-            String result = element.getSimpleName().toString();
-            while (element.getNestingKind() == NestingKind.MEMBER) {
-                element = (TypeElement) element.getEnclosingElement();
-                result = element.getSimpleName().toString() + '.' + result;
-            }
-            return result;
+    private static String packagelessCanonicalName(TypeElement element) {
+        String result = element.getSimpleName().toString();
+        while (element.getNestingKind() == NestingKind.MEMBER) {
+            element = (TypeElement) element.getEnclosingElement();
+            result = element.getSimpleName().toString() + '.' + result;
         }
+        return result;
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -86,7 +86,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static jdk.internal.classfile.impl.BytecodeHelpers.handleDescToHandleInfo;
-import jdk.internal.classfile.impl.TransformingCodeBuilder;
+
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -171,7 +171,7 @@ public sealed interface CodeBuilder
     default CodeBuilder transforming(CodeTransform transform, Consumer<CodeBuilder> handler) {
         var resolved = transform.resolve(this);
         resolved.startHandler().run();
-        handler.accept(new TransformingCodeBuilder(this, resolved.consumer()));
+        handler.accept(new ChainedCodeBuilder(this, resolved.consumer()));
         resolved.endHandler().run();
         return this;
     }

diff --git a/src/java.base/share/classes/java/lang/doc-files/ValueBased.html b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
- Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2024, 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
@@ -26,7 +26,6 @@
 <html lang="en">
 <head>
   <title>Value-based Classes</title>
-  <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <h1 id="ValueBased">{@index "Value-based Classes"}</h1>

diff --git a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
- Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2024, 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
@@ -26,7 +26,6 @@
 <html lang="en">
 <head>
   <title>Java Thread Primitive Deprecation</title>
-  <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <h1>Java Thread Primitive Deprecation</h1>

diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -631,6 +631,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, newSize, 1);
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -650,6 +653,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * alignment constraint. The returned segment's address is the address of this
      * segment plus the given offset; its size is specified by the given argument.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -677,6 +683,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, layout.byteSize(), layout.byteAlignment());
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -703,6 +712,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, byteSize() - offset);
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -719,6 +731,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * Returns a new memory segment that has the same address and scope as this segment,
      * but with the provided size.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -757,6 +772,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * scope, and is accessible from any thread. The size of the segment accepted by the
      * cleanup action is {@link #byteSize()}.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -805,6 +823,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * scope, and is accessible from any thread. The size of the segment accepted by the
      * cleanup action is {@code newSize}.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *

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
@@ -68,24 +68,19 @@ public abstract sealed class AbstractPoolEntry {
      */
 
     private static final int TAG_SMEAR = 0x13C4B2D1;
-    private static final int INT_PHI = 0x9E3779B9;
+    static final int NON_ZERO = 0x40000000;
 
     public static int hash1(int tag, int x1) {
-        return phiMix(tag * TAG_SMEAR + x1);
+        return (tag * TAG_SMEAR + x1) | NON_ZERO;
     }
 
     public static int hash2(int tag, int x1, int x2) {
-        return phiMix(tag * TAG_SMEAR + x1 + 31*x2);
+        return (tag * TAG_SMEAR + x1 + 31 * x2) | NON_ZERO;
     }
 
     // Ensure that hash is never zero
     public static int hashString(int stringHash) {
-        return phiMix(stringHash | (1 << 30));
-    }
-
-    public static int phiMix(int x) {
-        int h = x * INT_PHI;
-        return h ^ (h >> 16);
+        return stringHash | NON_ZERO;
     }
 
     public static Utf8Entry rawUtf8EntryFromStandardAttributeName(String name) {

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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,13 +51,13 @@ public BlockCodeBuilderImpl(CodeBuilder parent, Label breakLabel) {
 
     public void start() {
         topLocal = topLocal(parent);
-        terminalMaxLocals = topLocal(terminal);
-        terminal.with((LabelTarget) startLabel);
+        terminalMaxLocals = terminal.curTopLocal();
+        parent.with((LabelTarget) startLabel);
     }
 
     public void end() {
-        terminal.with((LabelTarget) endLabel);
-        if (terminalMaxLocals != topLocal(terminal)) {
+        parent.with((LabelTarget) endLabel);
+        if (terminalMaxLocals != terminal.curTopLocal()) {
             throw new IllegalStateException("Interference in local variable slot management");
         }
     }
@@ -73,10 +73,8 @@ public boolean isEmpty() {
     private int topLocal(CodeBuilder parent) {
         return switch (parent) {
             case BlockCodeBuilderImpl b -> b.topLocal;
-            case ChainedCodeBuilder b -> topLocal(b.terminal);
-            case DirectCodeBuilder b -> b.curTopLocal();
-            case BufferedCodeBuilder b -> b.curTopLocal();
-            case TransformingCodeBuilder b -> topLocal(b.delegate);
+            case ChainedCodeBuilder b -> b.terminal.curTopLocal();
+            case TerminalCodeBuilder b -> b.curTopLocal();
         };
     }
 

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -76,9 +76,7 @@ public boolean equals(Object obj) {
 
     static int computeHashCode(MethodHandleEntryImpl handle,
                                List<? extends LoadableConstantEntry> arguments) {
-        int hash = handle.hashCode();
-        hash = 31 * hash + arguments.hashCode();
-        return AbstractPoolEntry.phiMix(hash);
+        return (31 * handle.hashCode() + arguments.hashCode()) | AbstractPoolEntry.NON_ZERO;
     }
 
     @Override

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -988,77 +988,77 @@ public byte[] codeArray() {
     public static AttributeMapper<?> standardAttribute(Utf8Entry name) {
         // critical bootstrap path, so no lambdas nor method handles here
         return switch (name.hashCode()) {
-            case 0x78147009 ->
+            case 0x46699ff2 ->
                 name.equalsString(NAME_ANNOTATION_DEFAULT) ? annotationDefault() : null;
-            case 0x665e3a3a ->
+            case 0x5208e184 ->
                 name.equalsString(NAME_BOOTSTRAP_METHODS) ? bootstrapMethods() : null;
-            case 0xcb7e162 ->
+            case 0xcb60907a ->
                 name.equalsString(NAME_CHARACTER_RANGE_TABLE) ? characterRangeTable() : null;
-            case 0x21e41e7e ->
+            case 0x4020220d ->
                 name.equalsString(NAME_CODE) ? code() : null;
-            case 0x5a306b41 ->
+            case 0xc20dd1fe ->
                 name.equalsString(NAME_COMPILATION_ID) ? compilationId() : null;
-            case 0x3e191c7c ->
+            case 0xcab1940d ->
                 name.equalsString(NAME_CONSTANT_VALUE) ? constantValue() : null;
-            case 0x5e88ed0c ->
+            case 0x558641d3 ->
                 name.equalsString(NAME_DEPRECATED) ? deprecated() : null;
-            case 0x7284695e ->
+            case 0x51d443cd ->
                 name.equalsString(NAME_ENCLOSING_METHOD) ? enclosingMethod() : null;
-            case 0x21df25db ->
+            case 0x687c1624 ->
                 name.equalsString(NAME_EXCEPTIONS) ? exceptions() : null;
-            case 0x11392da9 ->
+            case 0x7adb2910 ->
                 name.equalsString(NAME_INNER_CLASSES) ? innerClasses() : null;
-            case 0x167536fc ->
+            case 0x653f0551 ->
                 name.equalsString(NAME_LINE_NUMBER_TABLE) ? lineNumberTable() : null;
-            case 0x46939abc ->
+            case 0x64c75927 ->
                 name.equalsString(NAME_LOCAL_VARIABLE_TABLE) ? localVariableTable() : null;
-            case 0x63ee67f4 ->
+            case 0x6697f98d ->
                 name.equalsString(NAME_LOCAL_VARIABLE_TYPE_TABLE) ? localVariableTypeTable() : null;
-            case 0x2b597e15 ->
+            case 0xdbb0cdcb ->
                 name.equalsString(NAME_METHOD_PARAMETERS) ? methodParameters() : null;
-            case 0x19f20ade ->
+            case 0xc9b0928c ->
                 name.equalsString(NAME_MODULE) ? module() : null;
-            case 0x47f6395e ->
+            case 0x41cd27e8 ->
                 name.equalsString(NAME_MODULE_HASHES) ? moduleHashes() : null;
-            case 0x54db809 ->
+            case 0x7deb0a13 ->
                 name.equalsString(NAME_MODULE_MAIN_CLASS) ? moduleMainClass() : null;
-            case 0x1abd1c2c ->
+            case 0x6706ff99 ->
                 name.equalsString(NAME_MODULE_PACKAGES) ? modulePackages() : null;
-            case 0x6ba46dd ->
+            case 0x60272858 ->
                 name.equalsString(NAME_MODULE_RESOLUTION) ? moduleResolution() : null;
-            case 0x46f7d91d ->
+            case 0x5646d73d ->
                 name.equalsString(NAME_MODULE_TARGET) ? moduleTarget() : null;
-            case 0x5137f53 ->
+            case 0x50336c40 ->
                 name.equalsString(NAME_NEST_HOST) ? nestHost() : null;
-            case 0x4a8fa3b6 ->
+            case 0x4735ab81 ->
                 name.equalsString(NAME_NEST_MEMBERS) ? nestMembers() : null;
-            case 0x55c73cb6 ->
+            case 0x7100d9fe ->
                 name.equalsString(NAME_PERMITTED_SUBCLASSES) ? permittedSubclasses() : null;
-            case 0x3fe76d4e ->
+            case 0xd1ab5871 ->
                 name.equalsString(NAME_RECORD) ? record() : null;
-            case 0x180d6925 ->
+            case 0x7588550f ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_ANNOTATIONS) ? runtimeInvisibleAnnotations() : null;
-            case 0x7be22752 ->
+            case 0xcc74da30 ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS) ? runtimeInvisibleParameterAnnotations() : null;
-            case 0x5299824 ->
+            case 0xf67697f5 ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS) ? runtimeInvisibleTypeAnnotations() : null;
-            case 0x3534786e ->
+            case 0xe0837d2a ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_ANNOTATIONS) ? runtimeVisibleAnnotations() : null;
-            case 0xb4b4ac6 ->
+            case 0xc945a075 ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS) ? runtimeVisibleParameterAnnotations() : null;
-            case 0x6926482 ->
+            case 0x611a3a90 ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_TYPE_ANNOTATIONS) ? runtimeVisibleTypeAnnotations() : null;
-            case 0x16a42b7c ->
+            case 0xf76fb898 ->
                 name.equalsString(NAME_SIGNATURE) ? signature() : null;
-            case 0x400ab245 ->
+            case 0x6b41b047 ->
                 name.equalsString(NAME_SOURCE_DEBUG_EXTENSION) ? sourceDebugExtension() : null;
-            case 0x2af490d4 ->
+            case 0x748c2857 ->
                 name.equalsString(NAME_SOURCE_FILE) ? sourceFile() : null;
-            case 0x303e0c58 ->
+            case 0x6bf13a96 ->
                 name.equalsString(NAME_SOURCE_ID) ? sourceId() : null;
-            case 0x19c7d0cd ->
+            case 0xfa85ee5a ->
                 name.equalsString(NAME_STACK_MAP_TABLE) ? stackMapTable() : null;
-            case 0x3dc79b7a ->
+            case 0xf2670725 ->
                 name.equalsString(NAME_SYNTHETIC) ? synthetic() : null;
             default -> null;
         };

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -43,7 +43,7 @@
 import java.util.function.Consumer;
 
 public final class BufferedCodeBuilder
-        implements TerminalCodeBuilder, LabelContext {
+        implements TerminalCodeBuilder {
     private final SplitConstantPool constantPool;
     private final ClassFileImpl context;
     private final List<CodeElement> elements = new ArrayList<>();