From b72846bc20cb65ff434e3318fbd325ddb36f8d45 Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Mon, 7 May 2018 23:07:01 +0200 Subject: [PATCH] 8202745: Remove hyphens from "out-of-bounds" Reviewed-by: rriggs, dholmes --- src/hotspot/cpu/ppc/ppc.ad | 2 +- .../gc/cms/concurrentMarkSweepGeneration.cpp | 2 +- .../share/gc/g1/g1Allocator.inline.hpp | 2 +- src/hotspot/share/gc/parallel/psMarkSweep.cpp | 2 +- .../share/gc/shared/referenceProcessor.cpp | 2 +- .../share/classes/java/util/Objects.java | 18 +++++----- .../jdk/internal/util/Preconditions.java | 36 +++++++++---------- .../javax/imageio/ImageWriteParam.java | 4 +-- .../classes/java/net/http/HttpRequest.java | 2 +- .../jtreg/runtime/7116786/Test7116786.java | 10 +++--- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad index 08838dec70c..2890d8bec30 100644 --- a/src/hotspot/cpu/ppc/ppc.ad +++ b/src/hotspot/cpu/ppc/ppc.ad @@ -1037,7 +1037,7 @@ bool followed_by_acquire(const Node *load) { // 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 && diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp index 6ee976a9ca3..934aa42d124 100644 --- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp +++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp @@ -7123,7 +7123,7 @@ size_t SweepClosure::do_blk_careful(HeapWord* addr) { // 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]", diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp index cc24bc01281..10b5f315d62 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp @@ -64,7 +64,7 @@ inline HeapWord* G1Allocator::attempt_allocation_force(size_t word_size) { 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()]; diff --git a/src/hotspot/share/gc/parallel/psMarkSweep.cpp b/src/hotspot/share/gc/parallel/psMarkSweep.cpp index 652e49b89b9..c8dc766cc6b 100644 --- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp +++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp @@ -293,7 +293,7 @@ bool PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) { 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(); diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp index e84682afc49..ea2e24aa134 100644 --- a/src/hotspot/share/gc/shared/referenceProcessor.cpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp @@ -790,7 +790,7 @@ inline DiscoveredList* ReferenceProcessor::get_discovered_list(ReferenceType rt) 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; diff --git a/src/java.base/share/classes/java/util/Objects.java b/src/java.base/share/classes/java/util/Objects.java index c6bf3c96133..1b97a2be6d0 100644 --- a/src/java.base/share/classes/java/util/Objects.java +++ b/src/java.base/share/classes/java/util/Objects.java @@ -35,16 +35,16 @@ import java.util.function.Supplier; * 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 @@ public final class Objects { * Checks if the {@code index} is within the bounds of the range from * {@code 0} (inclusive) to {@code length} (exclusive). * - *

The {@code index} is defined to be out-of-bounds if any of the + *

The {@code index} is defined to be out of bounds if any of the * following inequalities is true: *