Merge master HEAD into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java

@@ -24,6 +24,7 @@
  */
 package jdk.internal.foreign.abi;
 
+import java.lang.classfile.Annotation;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.Label;
@@ -46,10 +47,13 @@
 import jdk.internal.foreign.abi.Binding.ShiftRight;
 import jdk.internal.foreign.abi.Binding.VMLoad;
 import jdk.internal.foreign.abi.Binding.VMStore;
+import jdk.internal.vm.annotation.ForceInline;
 import sun.security.action.GetBooleanAction;
+import sun.security.action.GetIntegerAction;
 import sun.security.action.GetPropertyAction;
 
 import java.io.IOException;
+import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDesc;
 import java.lang.constant.DynamicConstantDesc;
@@ -77,6 +81,8 @@ public class BindingSpecializer {
         = GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.DUMP_CLASSES_DIR");
     private static final boolean PERFORM_VERIFICATION
         = GetBooleanAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.PERFORM_VERIFICATION");
+    private static final int SCOPE_DEDUP_DEPTH
+            = GetIntegerAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.SCOPE_DEDUP_DEPTH", 2);
 
     // Bunch of helper constants
     private static final int CLASSFILE_VERSION = ClassFileFormatVersion.latest().major();
@@ -99,6 +105,7 @@ public class BindingSpecializer {
     private static final ClassDesc CD_ValueLayout_OfFloat = referenceClassDesc(ValueLayout.OfFloat.class);
     private static final ClassDesc CD_ValueLayout_OfDouble = referenceClassDesc(ValueLayout.OfDouble.class);
     private static final ClassDesc CD_AddressLayout = referenceClassDesc(AddressLayout.class);
+    private static final ClassDesc CD_ForceInline = referenceClassDesc(ForceInline.class);
 
     private static final MethodTypeDesc MTD_NEW_BOUNDED_ARENA = MethodTypeDesc.of(CD_Arena, CD_long);
     private static final MethodTypeDesc MTD_NEW_EMPTY_ARENA = MethodTypeDesc.of(CD_Arena);
@@ -196,8 +203,9 @@ private static byte[] specializeHelper(MethodType leafType, MethodType callerMet
             clb.withFlags(ACC_PUBLIC + ACC_FINAL + ACC_SUPER)
                .withSuperclass(CD_Object)
                .withVersion(CLASSFILE_VERSION, 0)
-               .withMethodBody(METHOD_NAME, methodTypeDesc(callerMethodType), ACC_PUBLIC | ACC_STATIC,
-                    cb -> new BindingSpecializer(cb, callerMethodType, callingSequence, abi, leafType).specialize());
+               .withMethod(METHOD_NAME, methodTypeDesc(callerMethodType), ACC_PUBLIC | ACC_STATIC,
+                    mb -> mb.with(RuntimeVisibleAnnotationsAttribute.of(Annotation.of(CD_ForceInline)))
+                            .withCode(cb -> new BindingSpecializer(cb, callerMethodType, callingSequence, abi, leafType).specialize()));
         });
 
         if (DUMP_CLASSES_DIR != null) {
@@ -502,11 +510,19 @@ private void emitAcquireScope() {
 
         // start with 1 scope to maybe acquire on the stack
         assert curScopeLocalIdx != -1;
-        boolean hasOtherScopes = curScopeLocalIdx != 0;
-        for (int i = 0; i < curScopeLocalIdx; i++) {
+        boolean hasLookup = false;
+
+        // Here we check if the current scope has not been already acquired.
+        // To do that, we generate many comparisons (one per cached scope).
+        // Note that we always skip comparisons against the very first cached scope
+        // (as that is the function address, which typically belongs to another scope).
+        // We also stop the comparisons at SCOPE_DEDUP_DEPTH, to keep a lid on the size
+        // of the generated code.
+        for (int i = 1; i < curScopeLocalIdx && i <= SCOPE_DEDUP_DEPTH; i++) {
             cb.dup() // dup for comparison
               .aload(scopeSlots[i])
               .if_acmpeq(skipAcquire);
+            hasLookup = true;
         }
 
         // 1 scope to acquire on the stack
@@ -516,10 +532,10 @@ private void emitAcquireScope() {
         cb.invokevirtual(CD_MemorySessionImpl, "acquire0", MTD_ACQUIRE0) // call acquire on the other
           .astore(nextScopeLocal); // store off one to release later
 
-        if (hasOtherScopes) { // avoid ASM generating a bunch of nops for the dead code
+        if (hasLookup) { // avoid ASM generating a bunch of nops for the dead code
             cb.goto_(end)
-              .labelBinding(skipAcquire)
-              .pop(); // drop scope
+                    .labelBinding(skipAcquire)
+                    .pop(); // drop scope
         }
 
         cb.labelBinding(end);

src/java.compiler/share/classes/javax/lang/model/util/Elements.java

@@ -81,8 +81,8 @@ public interface Elements {
      * @implSpec The default implementation of this method returns
      * {@code null}.
      *
-     * @param name  fully qualified package name, or an empty string for an unnamed package
      * @param module module relative to which the lookup should happen
+     * @param name  fully qualified package name, or an empty string for an unnamed package
      * @return the specified package, or {@code null} if it cannot be found
      * @see #getAllPackageElements
      * @since 9
@@ -167,8 +167,8 @@ default Set<? extends PackageElement> getAllPackageElements(CharSequence name) {
      * @implSpec The default implementation of this method returns
      * {@code null}.
      *
-     * @param name  the canonical name
      * @param module module relative to which the lookup should happen
+     * @param name  the canonical name
      * @return the named type element, or {@code null} if it cannot be found
      * @see #getAllTypeElements
      * @since 9

src/java.management/share/classes/javax/management/AttributeList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -182,9 +182,9 @@ public void add(Attribute object)  {
      * size())} a RuntimeOperationsException should be raised, wrapping the
      * java.lang.IndexOutOfBoundsException thrown.
      *
-     * @param object  The <CODE>Attribute</CODE> object to be inserted.
      * @param index The position in the list where the new {@code Attribute}
      * object is to be inserted.
+     * @param object  The <CODE>Attribute</CODE> object to be inserted.
      */
     public void add(int index, Attribute object)  {
         try {
@@ -202,8 +202,8 @@ public void add(int index, Attribute object)  {
      * out of range {@literal (index < 0 || index > size())} a RuntimeOperationsException
      * should be raised, wrapping the java.lang.IndexOutOfBoundsException thrown.
      *
-     * @param object  The value to which the attribute element should be set.
      * @param index  The position specified.
+     * @param object  The value to which the attribute element should be set.
      */
     public void set(int index, Attribute object)  {
         try {
@@ -238,9 +238,9 @@ public boolean addAll(AttributeList list)  {
      * RuntimeOperationsException should be raised, wrapping the
      * java.lang.IndexOutOfBoundsException thrown.
      *
-     * @param list  Elements to be inserted into the list.
      * @param index  Position at which to insert the first element from the
      * <CODE>AttributeList</CODE> specified.
+     * @param list  Elements to be inserted into the list.
      *
      * @return true if this list changed as a result of the call.
      *

src/java.management/share/classes/javax/management/DefaultLoaderRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -80,8 +80,8 @@ public static Class<?> loadClass(String className)
      * is not found the method will throw a <CODE>ClassNotFoundException</CODE>
      * exception.
      *
-     * @param className The name of the class to be loaded.
      * @param loader The class loader to be excluded.
+     * @param className The name of the class to be loaded.
      *
      * @return the loaded class.
      *

src/java.management/share/classes/javax/management/MBeanConstructorInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -75,10 +75,10 @@ public MBeanConstructorInfo(String description, Constructor<?> constructor) {
      * Constructs an {@code MBeanConstructorInfo} object.
      *
      * @param name The name of the constructor.
+     * @param description A human readable description of the constructor.
      * @param signature {@code MBeanParameterInfo} objects
      * describing the parameters(arguments) of the constructor.  This
      * may be null with the same effect as a zero-length array.
-     * @param description A human readable description of the constructor.
      */
     public MBeanConstructorInfo(String name,
                                 String description,
@@ -90,10 +90,10 @@ public MBeanConstructorInfo(String name,
      * Constructs an {@code MBeanConstructorInfo} object.
      *
      * @param name The name of the constructor.
+     * @param description A human readable description of the constructor.
      * @param signature {@code MBeanParameterInfo} objects
      * describing the parameters(arguments) of the constructor.  This
      * may be null with the same effect as a zero-length array.
-     * @param description A human readable description of the constructor.
      * @param descriptor The descriptor for the constructor.  This may be null
      * which is equivalent to an empty descriptor.
      *

src/java.management/share/classes/javax/management/MBeanOperationInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -97,9 +97,9 @@ public class MBeanOperationInfo extends MBeanFeatureInfo implements Cloneable {
      * fields contributed by any annotations on the {@code Method}
      * object that contain the {@link DescriptorKey} meta-annotation.
      *
+     * @param description A human readable description of the operation.
      * @param method The {@code java.lang.reflect.Method} object
      * describing the MBean operation.
-     * @param description A human readable description of the operation.
      */
     public MBeanOperationInfo(String description, Method method) {
         this(method.getName(),

src/java.management/share/classes/javax/management/MBeanServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -622,11 +622,11 @@ public Object instantiate(String className, Object params[],
      * newly created object is not registered in the MBean server.</p>
      *
      * @param className The class name of the object to be instantiated.
+     * @param loaderName The object name of the class loader to be used.
      * @param params An array containing the parameters of the
      * constructor to be invoked.
      * @param signature An array containing the signature of the
      * constructor to be invoked.
-     * @param loaderName The object name of the class loader to be used.
      *
      * @return The newly instantiated object.
      *
@@ -711,10 +711,10 @@ default public ObjectInputStream deserialize(String className, byte[] data)
      *
      * @param className The name of the class whose class loader should be
      * used for the de-serialization.
-     * @param data The byte array to be de-sererialized.
      * @param loaderName The name of the class loader to be used for
      * loading the specified class.  If null, the MBean Server's class
      * loader will be used.
+     * @param data The byte array to be de-sererialized.
      *
      * @implSpec This method throws {@link UnsupportedOperationException} by default.
      *

src/java.management/share/classes/javax/management/MBeanServerConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -278,11 +278,11 @@ public ObjectInstance createMBean(String className, ObjectName name,
      *
      * @param className The class name of the MBean to be instantiated.
      * @param name The object name of the MBean. May be null.
+     * @param loaderName The object name of the class loader to be used.
      * @param params An array containing the parameters of the
      * constructor to be invoked.
      * @param signature An array containing the signature of the
      * constructor to be invoked.
-     * @param loaderName The object name of the class loader to be used.
      *
      * @return An <CODE>ObjectInstance</CODE>, containing the
      * <CODE>ObjectName</CODE> and the Java class name of the newly

src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -100,10 +100,10 @@ public Class<?> loadClass(String className)
      * the same time.  The {@link #loadClassBefore} method is
      * recommended to avoid the risk of deadlock.</p>
      *
-     * @param className The name of the class to be loaded.
      * @param exclude The class loader to be excluded.  May be null,
      * in which case this method is equivalent to {@link #loadClass
      * loadClass(className)}.
+     * @param className The name of the class to be loaded.
      *
      * @return the loaded class.
      *
@@ -133,10 +133,10 @@ public Class<?> loadClassWithout(ClassLoader exclude,
      * search as soon as <code>stop</code> is reached, a potential
      * deadlock with concurrent class loading is avoided.</p>
      *
-     * @param className The name of the class to be loaded.
      * @param stop The class loader at which to stop.  May be null, in
      * which case this method is equivalent to {@link #loadClass(String)
      * loadClass(className)}.
+     * @param className The name of the class to be loaded.
      *
      * @return the loaded class.
      *

src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -88,8 +88,8 @@ public static Class<?> loadClass(String className)
      * is not found the method will throw a <CODE>ClassNotFoundException</CODE>
      * exception.
      *
-     * @param className The name of the class to be loaded.
      * @param loader The class loader to be excluded.
+     * @param className The name of the class to be loaded.
      *
      * @return the loaded class.
      *

src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java

@@ -136,9 +136,9 @@ public class ModelMBeanOperationInfo extends MBeanOperationInfo
          * on the {@code Method} object that contain the {@link
          * DescriptorKey} meta-annotation.
          *
+         * @param description A human readable description of the operation.
          * @param operationMethod The java.lang.reflect.Method object
          * describing the MBean operation.
-         * @param description A human readable description of the operation.
          */
 
         public ModelMBeanOperationInfo(String description,
@@ -160,10 +160,10 @@ public ModelMBeanOperationInfo(String description,
          * contributed by any annotations on the {@code Method} object
          * that contain the {@link DescriptorKey} meta-annotation.
          *
-         * @param operationMethod The java.lang.reflect.Method object
-         * describing the MBean operation.
          * @param description A human readable description of the
          * operation.
+         * @param operationMethod The java.lang.reflect.Method object
+         * describing the MBean operation.
          * @param descriptor An instance of Descriptor containing the
          * appropriate metadata for this instance of the
          * ModelMBeanOperationInfo.  If it is null a default

src/java.naming/share/classes/javax/naming/CompositeName.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -485,9 +485,9 @@ public Name addAll(Name suffix)
       * new component are shifted up (away from index 0)
       * to accommodate the new components.
       *
-      * @param n        The non-null components to add.
       * @param posn     The index in this name at which to add the new
       *                 components.  Must be in the range [0,size()].
+      * @param n        The non-null components to add.
       * @return The updated CompositeName, not a new one. Cannot be null.
       * @throws InvalidNameException If n is not a composite name.
       * @throws ArrayIndexOutOfBoundsException
@@ -525,9 +525,9 @@ public Name add(String comp) throws InvalidNameException {
       * component are shifted up by one (away from index 0) to accommodate
       * the new component.
       *
-      * @param  comp    The non-null component to add.
       * @param  posn    The index at which to add the new component.
       *                 Must be in the range [0,size()].
+      * @param  comp    The non-null component to add.
       * @return The updated CompositeName, not a new one. Cannot be null.
       * @throws ArrayIndexOutOfBoundsException
       *         If posn is outside the specified range.

src/java.naming/share/classes/javax/naming/CompoundName.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -472,9 +472,9 @@ public Name addAll(Name suffix) throws InvalidNameException {
       * Implementation note: Currently the syntax properties of suffix
       *  is not used or checked. They might be in the future.
       *
-      * @param n        The non-null components to add.
       * @param posn     The index in this name at which to add the new
       *                 components.  Must be in the range [0,size()].
+      * @param n        The non-null components to add.
       * @return The updated CompoundName, not a new one. Cannot be null.
       * @throws ArrayIndexOutOfBoundsException
       *         If posn is outside the specified range.
@@ -512,9 +512,9 @@ public Name add(String comp) throws InvalidNameException{
       * component are shifted up by one (away from index 0)
       * to accommodate the new component.
       *
-      * @param  comp    The non-null component to add.
       * @param  posn    The index at which to add the new component.
       *                 Must be in the range [0,size()].
+      * @param  comp    The non-null component to add.
       * @throws ArrayIndexOutOfBoundsException
       *         If posn is outside the specified range.
       * @return The updated CompoundName, not a new one. Cannot be null.