changeset 50644:bf2f27b92064

8202745: Remove hyphens from "out-of-bounds". Reviewed-by: rriggs, dholmes
author goetz
date Mon, 07 May 2018 23:07:01 +0200
parents 2f79462aab9b
children 4502902f343d
files src/hotspot/cpu/ppc/ppc.ad src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp src/hotspot/share/gc/g1/g1Allocator.inline.hpp src/hotspot/share/gc/parallel/psMarkSweep.cpp src/hotspot/share/gc/shared/referenceProcessor.cpp src/java.base/share/classes/java/util/Objects.java src/java.base/share/classes/jdk/internal/util/Preconditions.java src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java src/java.net.http/share/classes/java/net/http/HttpRequest.java test/hotspot/jtreg/runtime/7116786/Test7116786.java
diffstat 10 files changed, 40 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/ppc/ppc.ad	Mon May 07 09:11:21 2018 +0200
+++ b/src/hotspot/cpu/ppc/ppc.ad	Mon May 07 23:07:01 2018 +0200
@@ -1037,7 +1037,7 @@
   // So first get the Proj node, mem_proj, to use it to iterate forward.
   Node *mem_proj = NULL;
   for (DUIterator_Fast imax, i = mba->fast_outs(imax); i < imax; i++) {
-    mem_proj = mba->fast_out(i);      // Throw out-of-bounds if proj not found
+    mem_proj = mba->fast_out(i);      // Runs out of bounds and asserts if Proj not found.
     assert(mem_proj->is_Proj(), "only projections here");
     ProjNode *proj = mem_proj->as_Proj();
     if (proj->_con == TypeFunc::Memory &&
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	Mon May 07 09:11:21 2018 +0200
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	Mon May 07 23:07:01 2018 +0200
@@ -7123,7 +7123,7 @@
     // coalesced chunk to the appropriate free list.
     if (inFreeRange()) {
       assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
-             "freeFinger() " PTR_FORMAT " is out-of-bounds", p2i(freeFinger()));
+             "freeFinger() " PTR_FORMAT " is out of bounds", p2i(freeFinger()));
       flush_cur_free_chunk(freeFinger(),
                            pointer_delta(addr, freeFinger()));
       log_develop_trace(gc, sweep)("Sweep: last chunk: put_free_blk " PTR_FORMAT " (" SIZE_FORMAT ") [coalesced:%d]",
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Mon May 07 09:11:21 2018 +0200
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Mon May 07 23:07:01 2018 +0200
@@ -64,7 +64,7 @@
 
 inline PLAB* G1PLABAllocator::alloc_buffer(InCSetState dest) {
   assert(dest.is_valid(),
-         "Allocation buffer index out-of-bounds: " CSETSTATE_FORMAT, dest.value());
+         "Allocation buffer index out of bounds: " CSETSTATE_FORMAT, dest.value());
   assert(_alloc_buffers[dest.value()] != NULL,
          "Allocation buffer is NULL: " CSETSTATE_FORMAT, dest.value());
   return _alloc_buffers[dest.value()];
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp	Mon May 07 09:11:21 2018 +0200
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp	Mon May 07 23:07:01 2018 +0200
@@ -293,7 +293,7 @@
         assert(young_gen->max_size() >
           young_gen->from_space()->capacity_in_bytes() +
           young_gen->to_space()->capacity_in_bytes(),
-          "Sizes of space in young gen are out-of-bounds");
+          "Sizes of space in young gen are out of bounds");
 
         size_t young_live = young_gen->used_in_bytes();
         size_t eden_live = young_gen->eden_space()->used_in_bytes();
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp	Mon May 07 09:11:21 2018 +0200
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp	Mon May 07 23:07:01 2018 +0200
@@ -790,7 +790,7 @@
       id = next_id();
     }
   }
-  assert(id < _max_num_queues, "Id is out-of-bounds id %u and max id %u)", id, _max_num_queues);
+  assert(id < _max_num_queues, "Id is out of bounds id %u and max id %u)", id, _max_num_queues);
 
   // Get the discovered queue to which we will add
   DiscoveredList* list = NULL;
--- a/src/java.base/share/classes/java/util/Objects.java	Mon May 07 09:11:21 2018 +0200
+++ b/src/java.base/share/classes/java/util/Objects.java	Mon May 07 23:07:01 2018 +0200
@@ -35,16 +35,16 @@
  * on objects, or checking certain conditions before operation.  These utilities
  * include {@code null}-safe or {@code null}-tolerant methods for computing the
  * hash code of an object, returning a string for an object, comparing two
- * objects, and checking if indexes or sub-range values are out-of-bounds.
+ * objects, and checking if indexes or sub-range values are out of bounds.
  *
  * @apiNote
  * Static methods such as {@link Objects#checkIndex},
  * {@link Objects#checkFromToIndex}, and {@link Objects#checkFromIndexSize} are
  * provided for the convenience of checking if values corresponding to indexes
- * and sub-ranges are out-of-bounds.
+ * and sub-ranges are out of bounds.
  * Variations of these static methods support customization of the runtime
  * exception, and corresponding exception detail message, that is thrown when
- * values are out-of-bounds.  Such methods accept a functional interface
+ * values are out of bounds.  Such methods accept a functional interface
  * argument, instances of {@code BiFunction}, that maps out-of-bound values to a
  * runtime exception.  Care should be taken when using such methods in
  * combination with an argument that is a lambda expression, method reference or
@@ -352,7 +352,7 @@
      * Checks if the {@code index} is within the bounds of the range from
      * {@code 0} (inclusive) to {@code length} (exclusive).
      *
-     * <p>The {@code index} is defined to be out-of-bounds if any of the
+     * <p>The {@code index} is defined to be out of bounds if any of the
      * following inequalities is true:
      * <ul>
      *  <li>{@code index < 0}</li>
@@ -363,7 +363,7 @@
      * @param index the index
      * @param length the upper-bound (exclusive) of the range
      * @return {@code index} if it is within bounds of the range
-     * @throws IndexOutOfBoundsException if the {@code index} is out-of-bounds
+     * @throws IndexOutOfBoundsException if the {@code index} is out of bounds
      * @since 9
      */
     @ForceInline
@@ -377,7 +377,7 @@
      * {@code toIndex} (exclusive) is within the bounds of range from {@code 0}
      * (inclusive) to {@code length} (exclusive).
      *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * <p>The sub-range is defined to be out of bounds if any of the following
      * inequalities is true:
      * <ul>
      *  <li>{@code fromIndex < 0}</li>
@@ -390,7 +390,7 @@
      * @param toIndex the upper-bound (exclusive) of the sub-range
      * @param length the upper-bound (exclusive) the range
      * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds
+     * @throws IndexOutOfBoundsException if the sub-range is out of bounds
      * @since 9
      */
     public static
@@ -403,7 +403,7 @@
      * {@code fromIndex + size} (exclusive) is within the bounds of range from
      * {@code 0} (inclusive) to {@code length} (exclusive).
      *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * <p>The sub-range is defined to be out of bounds if any of the following
      * inequalities is true:
      * <ul>
      *  <li>{@code fromIndex < 0}</li>
@@ -416,7 +416,7 @@
      * @param size the size of the sub-range
      * @param length the upper-bound (exclusive) of the range
      * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds
+     * @throws IndexOutOfBoundsException if the sub-range is out of bounds
      * @since 9
      */
     public static
--- a/src/java.base/share/classes/jdk/internal/util/Preconditions.java	Mon May 07 09:11:21 2018 +0200
+++ b/src/java.base/share/classes/jdk/internal/util/Preconditions.java	Mon May 07 23:07:01 2018 +0200
@@ -185,13 +185,13 @@
         // Switch to default if fewer or more arguments than required are supplied
         switch ((args.size() != argSize) ? "" : checkKind) {
             case "checkIndex":
-                return String.format("Index %d out-of-bounds for length %d",
+                return String.format("Index %d out of bounds for length %d",
                                      args.get(0), args.get(1));
             case "checkFromToIndex":
-                return String.format("Range [%d, %d) out-of-bounds for length %d",
+                return String.format("Range [%d, %d) out of bounds for length %d",
                                      args.get(0), args.get(1), args.get(2));
             case "checkFromIndexSize":
-                return String.format("Range [%d, %<d + %d) out-of-bounds for length %d",
+                return String.format("Range [%d, %<d + %d) out of bounds for length %d",
                                      args.get(0), args.get(1), args.get(2));
             default:
                 return String.format("Range check failed: %s %s", checkKind, args);
@@ -202,7 +202,7 @@
      * Checks if the {@code index} is within the bounds of the range from
      * {@code 0} (inclusive) to {@code length} (exclusive).
      *
-     * <p>The {@code index} is defined to be out-of-bounds if any of the
+     * <p>The {@code index} is defined to be out of bounds if any of the
      * following inequalities is true:
      * <ul>
      *  <li>{@code index < 0}</li>
@@ -210,14 +210,14 @@
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>If the {@code index} is out-of-bounds, then a runtime exception is
+     * <p>If the {@code index} is out of bounds, then a runtime exception is
      * thrown that is the result of applying the following arguments to the
      * exception formatter: the name of this method, {@code checkIndex};
      * and an unmodifiable list integers whose values are, in order, the
      * out-of-bounds arguments {@code index} and {@code length}.
      *
      * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
+     *        out of bounds
      * @param index the index
      * @param length the upper-bound (exclusive) of the range
      * @param oobef the exception formatter that when applied with this
@@ -228,9 +228,9 @@
      *        instead (though it may be more efficient).
      *        Exceptions thrown by the formatter are relayed to the caller.
      * @return {@code index} if it is within bounds of the range
-     * @throws X if the {@code index} is out-of-bounds and the exception
+     * @throws X if the {@code index} is out of bounds and the exception
      *         formatter is non-{@code null}
-     * @throws IndexOutOfBoundsException if the {@code index} is out-of-bounds
+     * @throws IndexOutOfBoundsException if the {@code index} is out of bounds
      *         and the exception formatter is {@code null}
      * @since 9
      *
@@ -254,7 +254,7 @@
      * {@code toIndex} (exclusive) is within the bounds of range from {@code 0}
      * (inclusive) to {@code length} (exclusive).
      *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * <p>The sub-range is defined to be out of bounds if any of the following
      * inequalities is true:
      * <ul>
      *  <li>{@code fromIndex < 0}</li>
@@ -263,14 +263,14 @@
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
+     * <p>If the sub-range is out of bounds, then a runtime exception is
      * thrown that is the result of applying the following arguments to the
      * exception formatter: the name of this method, {@code checkFromToIndex};
      * and an unmodifiable list integers whose values are, in order, the
      * out-of-bounds arguments {@code fromIndex}, {@code toIndex}, and {@code length}.
      *
      * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
+     *        out of bounds
      * @param fromIndex the lower-bound (inclusive) of the sub-range
      * @param toIndex the upper-bound (exclusive) of the sub-range
      * @param length the upper-bound (exclusive) the range
@@ -282,9 +282,9 @@
      *        instead (though it may be more efficient).
      *        Exceptions thrown by the formatter are relayed to the caller.
      * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws X if the sub-range is out-of-bounds and the exception factory
+     * @throws X if the sub-range is out of bounds and the exception factory
      *         function is non-{@code null}
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
+     * @throws IndexOutOfBoundsException if the sub-range is out of bounds and
      *         the exception factory function is {@code null}
      * @since 9
      */
@@ -301,7 +301,7 @@
      * {@code fromIndex + size} (exclusive) is within the bounds of range from
      * {@code 0} (inclusive) to {@code length} (exclusive).
      *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * <p>The sub-range is defined to be out of bounds if any of the following
      * inequalities is true:
      * <ul>
      *  <li>{@code fromIndex < 0}</li>
@@ -310,7 +310,7 @@
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
+     * <p>If the sub-range is out of bounds, then a runtime exception is
      * thrown that is the result of applying the following arguments to the
      * exception formatter: the name of this method, {@code checkFromIndexSize};
      * and an unmodifiable list integers whose values are, in order, the
@@ -318,7 +318,7 @@
      * {@code length}.
      *
      * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
+     *        out of bounds
      * @param fromIndex the lower-bound (inclusive) of the sub-interval
      * @param size the size of the sub-range
      * @param length the upper-bound (exclusive) of the range
@@ -330,9 +330,9 @@
      *        instead (though it may be more efficient).
      *        Exceptions thrown by the formatter are relayed to the caller.
      * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws X if the sub-range is out-of-bounds and the exception factory
+     * @throws X if the sub-range is out of bounds and the exception factory
      *         function is non-{@code null}
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
+     * @throws IndexOutOfBoundsException if the sub-range is out of bounds and
      *         the exception factory function is {@code null}
      * @since 9
      */
--- a/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java	Mon May 07 09:11:21 2018 +0200
+++ b/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java	Mon May 07 23:07:01 2018 +0200
@@ -1243,7 +1243,7 @@
             throw new IllegalStateException("No compression type set!");
         }
         if (quality < 0.0F || quality > 1.0F) {
-            throw new IllegalArgumentException("Quality out-of-bounds!");
+            throw new IllegalArgumentException("Quality out of bounds!");
         }
         this.compressionQuality = quality;
     }
@@ -1341,7 +1341,7 @@
             throw new IllegalStateException("No compression type set!");
         }
         if (quality < 0.0F || quality > 1.0F) {
-            throw new IllegalArgumentException("Quality out-of-bounds!");
+            throw new IllegalArgumentException("Quality out of bounds!");
         }
         return -1.0F;
     }
--- a/src/java.net.http/share/classes/java/net/http/HttpRequest.java	Mon May 07 09:11:21 2018 +0200
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java	Mon May 07 23:07:01 2018 +0200
@@ -598,7 +598,7 @@
          * @param length the number of bytes to use
          * @return a BodyPublisher
          * @throws IndexOutOfBoundsException if the sub-range is defined to be
-         *                                   out-of-bounds
+         *                                   out of bounds
          */
         public static BodyPublisher ofByteArray(byte[] buf, int offset, int length) {
             Objects.checkFromIndexSize(offset, length, buf.length);
--- a/test/hotspot/jtreg/runtime/7116786/Test7116786.java	Mon May 07 09:11:21 2018 +0200
+++ b/test/hotspot/jtreg/runtime/7116786/Test7116786.java	Mon May 07 23:07:01 2018 +0200
@@ -94,7 +94,7 @@
                  "Bad type on operand stack"),
 
         new Case("case02", "stackMapFrame.cpp", true, "get_local",
-                 "local index out-of-bounds",
+                 "local index out of bounds",
                  "Local variable table overflow"),
 
         new Case("case03", "stackMapFrame.cpp", true, "get_local",
@@ -102,7 +102,7 @@
                  "Bad local variable type"),
 
         new Case("case04", "stackMapFrame.cpp", true, "get_local_2",
-                 "local index out-of-bounds [type2]",
+                 "local index out of bounds [type2]",
                  "get long/double overflows locals"),
 
         new Case("case05", "stackMapFrame.cpp", true, "get_local_2",
@@ -115,11 +115,11 @@
                  "Bad local variable type"),
 
         new Case("case07", "stackMapFrame.cpp", true, "set_local",
-                 "local index out-of-bounds",
+                 "local index out of bounds",
                  "Local variable table overflow"),
 
         new Case("case08", "stackMapFrame.cpp", true, "set_local_2",
-                 "local index out-of-bounds [type2]",
+                 "local index out of bounds [type2]",
                  "Local variable table overflow"),
 
         new Case("case09", "stackMapFrame.hpp", true, "push_stack",
@@ -322,7 +322,7 @@
                  "Stack map does not match the one at exception handler "),
 
         new Case("case54", "verifier.cpp", true, "verify_cp_index",
-                 "constant pool index is out-of-bounds",
+                 "constant pool index is out of bounds",
                  "Illegal constant pool index "),
 
         new Case("case55", "verifier.cpp", true, "verify_cp_type",