Merge master HEAD into openj9-staging

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

Author: j9build

src/java.compiler/share/classes/javax/tools/JavaFileManager.java

@@ -170,7 +170,7 @@ interface Location {
          * @since 9
          */
         default boolean isModuleOrientedLocation() {
-            return getName().matches("\\bMODULE\\b");
+            return StandardLocation.computeIsModuleOrientedLocation(getName());
         }
     }
 

src/java.compiler/share/classes/javax/tools/StandardLocation.java

@@ -27,7 +27,9 @@
 
 import javax.tools.JavaFileManager.Location;
 
+import java.util.Objects;
 import java.util.concurrent.*;
+import java.util.regex.Pattern;
 
 /**
  * Standard locations of file objects.
@@ -109,6 +111,22 @@ public enum StandardLocation implements Location {
      */
     PATCH_MODULE_PATH;
 
+    /**
+     * Canonical location instances.
+     */
+    private static final ConcurrentHashMap<String, Location> LOCATIONS = new ConcurrentHashMap<>();
+
+    private static class LazyPatternHolder {
+        /**
+         * Regexp that checks for the word "MODULE".
+         */
+        static final Pattern MODULE_WORD_PATTERN = Pattern.compile("\\bMODULE\\b");
+    }
+
+    /* package private */ static final boolean computeIsModuleOrientedLocation(String name) {
+        return LazyPatternHolder.MODULE_WORD_PATTERN.matcher(name).matches();
+    }
+
     /**
      * Returns a location object with the given name.  The following
      * property must hold: {@code locationFor(x) ==
@@ -122,23 +140,40 @@ public enum StandardLocation implements Location {
      * @return a location
      */
     public static Location locationFor(final String name) {
-        if (locations.isEmpty()) {
-            // can't use valueOf which throws IllegalArgumentException
-            for (Location location : values())
-                locations.putIfAbsent(location.getName(), location);
+        Objects.requireNonNull(name, "name");
+
+        // Check for immediate hit.
+        Location loc = LOCATIONS.get(name);
+        if (loc != null) {
+            return loc;
+        }
+
+        // Need to create the cache entry.
+        Location newLoc = null;
+
+        // See if this is one of the known Locations first.
+        for (Location location : values()) {
+            if (location.getName().equals(name)) {
+                newLoc = location;
+                break;
+            }
         }
-        name.getClass(); /* null-check */
-        locations.putIfAbsent(name, new Location() {
-                @Override
-                public String getName() { return name; }
-                @Override
-                public boolean isOutputLocation() { return name.endsWith("_OUTPUT"); }
-            });
-        return locations.get(name);
+
+        // Compute the fitting instance for unknown location, if needed.
+        if (newLoc == null) {
+            boolean isOutputLocation = name.endsWith("_OUTPUT");
+            boolean isModuleOrientedLocation = computeIsModuleOrientedLocation(name);
+            newLoc = new Location() {
+                @Override public String getName() { return name; }
+                @Override public boolean isOutputLocation() { return isOutputLocation; }
+                @Override public boolean isModuleOrientedLocation() { return isModuleOrientedLocation; }
+            };
+        }
+
+        // Thread-safe install.
+        Location exist = LOCATIONS.putIfAbsent(name, newLoc);
+        return (exist != null) ? exist : newLoc;
     }
-    //where
-        private static final ConcurrentMap<String,Location> locations
-            = new ConcurrentHashMap<>();
 
     @Override
     public String getName() { return name(); }

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java

@@ -44,7 +44,7 @@ abstract class AbstractVector<E> extends Vector<E> {
     /**
      * The order of vector bytes when stored in natural,
      * array elements of the same lane type.
-     * This is the also the behavior of the
+     * This is also the behavior of the
      * VectorSupport load/store instructions.
      * If these instructions gain the capability to do
      * byte swapping on the fly, add a bit to those
@@ -302,8 +302,9 @@ public DoubleVector reinterpretAsDoubles() {
     Vector<F> convert(Conversion<E,F> conv, int part) {
         // Shape invariance is simple to implement.
         // It's part of the API because shape invariance
-        // is the default mode of operation, and shape
-        // shifting operations must advertise themselves.
+        // is the default mode of operation, and
+        // shape-shifting operations must advertise
+        // themselves.
         ConversionImpl<E,F> c = (ConversionImpl<E,F>) conv;
         @SuppressWarnings("unchecked")
         VectorSpecies<F> rsp = (VectorSpecies<F>)

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java

@@ -84,7 +84,7 @@ static boolean opKind(Operator op, int bit) {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ static ByteVector selectFromTwoVectorHelper(Vector<Byte> indexes, Vector<Byte> s
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Byte>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1748,7 +1748,7 @@ public final ByteVector max(byte e) {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1781,7 +1781,7 @@ public final ByteVector and(Vector<Byte> v) {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1805,7 +1805,7 @@ public final ByteVector and(byte e) {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1838,7 +1838,7 @@ public final ByteVector or(Vector<Byte> v) {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1906,7 +1906,7 @@ static byte reverse(byte a) {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2950,7 +2950,7 @@ public final byte[] toArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2970,7 +2970,7 @@ public final int[] toIntArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2990,7 +2990,7 @@ public final long[] toLongArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision.
      */

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java

@@ -84,7 +84,7 @@ static boolean opKind(Operator op, int bit) {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -543,7 +543,7 @@ static DoubleVector selectFromTwoVectorHelper(Vector<Double> indexes, Vector<Dou
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Double>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -2771,7 +2771,7 @@ public final long[] toLongArray() {
     /** {@inheritDoc} <!--workaround-->
      * @implNote
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code DoubleVector},
      * there will be no loss of precision.
      */

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java

@@ -2262,7 +2262,7 @@ static long pow10(int e) {
          * &lt; 10<sup><i>k</i>+1</sup>.
          * <p>
          * The result is correct when |{@code e}| &le; 6_432_162.
-         * Otherwise the result is undefined.
+         * Otherwise, the result is undefined.
          *
          * @param e The exponent of 2, which should meet
          *          |{@code e}| &le; 6_432_162 for safe results.
@@ -2279,7 +2279,7 @@ static int flog10pow2(int e) {
          * <p>
          * The result is correct when
          * -3_606_689 &le; {@code e} &le; 3_150_619.
-         * Otherwise the result is undefined.
+         * Otherwise, the result is undefined.
          *
          * @param e The exponent of 2, which should meet
          *          -3_606_689 &le; {@code e} &le; 3_150_619 for safe results.
@@ -2296,7 +2296,7 @@ static int flog10threeQuartersPow2(int e) {
          * &lt; 2<sup><i>k</i>+1</sup>.
          * <p>
          * The result is correct when |{@code e}| &le; 1_838_394.
-         * Otherwise the result is undefined.
+         * Otherwise, the result is undefined.
          *
          * @param e The exponent of 10, which should meet
          *          |{@code e}| &le; 1_838_394 for safe results.

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java

@@ -84,7 +84,7 @@ static boolean opKind(Operator op, int bit) {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -543,7 +543,7 @@ static FloatVector selectFromTwoVectorHelper(Vector<Float> indexes, Vector<Float
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Float>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -2790,7 +2790,7 @@ public final long[] toLongArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code FloatVector},
      * there will be no loss of precision.
      */

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java

@@ -84,7 +84,7 @@ static boolean opKind(Operator op, int bit) {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ static IntVector selectFromTwoVectorHelper(Vector<Integer> indexes, Vector<Integ
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Integer>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1751,7 +1751,7 @@ public final IntVector max(int e) {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1784,7 +1784,7 @@ public final IntVector and(Vector<Integer> v) {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1808,7 +1808,7 @@ public final IntVector and(int e) {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1841,7 +1841,7 @@ public final IntVector or(Vector<Integer> v) {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1891,7 +1891,7 @@ IntVector abs() {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2936,7 +2936,7 @@ public final int[] toArray() {
     /**
      * {@inheritDoc} <!--workaround-->
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of range or precision.
      */
@@ -2948,7 +2948,7 @@ public final int[] toIntArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2968,7 +2968,7 @@ public final long[] toLongArray() {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of precision.
      */