Skip to content

Commit 4a242e3

Browse files
committed
8354213: Restore pointless unicode characters to ASCII
Reviewed-by: naoto, erikj, iris
1 parent 776e1cf commit 4a242e3

22 files changed

+45
-45
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Contributing to the JDK
22

3-
Please see the [OpenJDK Developers Guide](https://openjdk.org/guide/).
3+
Please see the [OpenJDK Developers' Guide](https://openjdk.org/guide/).

doc/hotspot-unit-tests.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Prefer having checks inside test code.
106106

107107
Not only does having test logic outside, e.g. verification method,
108108
depending on asserts in product code contradict with several items
109-
above but also decreases tests readability and stability. It is much
109+
above but also decreases test's readability and stability. It is much
110110
easier to understand that a test is testing when all testing logic is
111111
located inside a test or nearby in shared test libraries. As a rule of
112112
thumb, the closer a check to a test, the better.
@@ -119,7 +119,7 @@ Prefer `EXPECT` over `ASSERT` if possible.
119119

120120
This is related to the [informativeness](#informativeness) property of
121121
tests, information for other checks can help to better localize a
122-
defects root-cause. One should use `ASSERT` if it is impossible to
122+
defect's root-cause. One should use `ASSERT` if it is impossible to
123123
continue test execution or if it does not make much sense. Later in
124124
the text, `EXPECT` forms will be used to refer to both
125125
`ASSERT/EXPECT`.
@@ -160,7 +160,7 @@ value of the difference between `v1` and `v2` is not greater than `eps`.
160160

161161
Use string special macros for C strings comparisons.
162162

163-
`EXPECT_EQ` just compares pointers values, which is hardly what one
163+
`EXPECT_EQ` just compares pointers' values, which is hardly what one
164164
wants comparing C strings. GoogleTest provides `EXPECT_STREQ` and
165165
`EXPECT_STRNE` macros to compare C string contents. There are also
166166
case-insensitive versions `EXPECT_STRCASEEQ`, `EXPECT_STRCASENE`.
@@ -226,7 +226,7 @@ subsystem, etc.
226226

227227
This naming scheme helps to find tests, filter them and simplifies
228228
test failure analysis. For example, class `Foo` - test group `Foo`,
229-
compiler logging subsystem - test group `CompilerLogging`, G1 GC test
229+
compiler logging subsystem - test group `CompilerLogging`, G1 GC - test
230230
group `G1GC`, and so forth.
231231

232232
### Filename
@@ -287,7 +287,7 @@ Fixture classes should be named after tested classes, subsystems, etc
287287

288288
All test purpose friends should have either `Test` or `Testable` suffix.
289289

290-
It greatly simplifies understanding of friendships purpose and allows
290+
It greatly simplifies understanding of friendship's purpose and allows
291291
statically check that private members are not exposed unexpectedly.
292292
Having `FooTest` as a friend of `Foo` without any comments will be
293293
understood as a necessary evil to get testability.
@@ -397,7 +397,7 @@ and filter out inapplicable tests.
397397
Restore changed flags.
398398

399399
It is quite common for tests to configure JVM in a certain way
400-
changing flags values. GoogleTest provides two ways to set up
400+
changing flags' values. GoogleTest provides two ways to set up
401401
environment before a test and restore it afterward: using either
402402
constructor and destructor or `SetUp` and `TearDown` functions. Both ways
403403
require to use a test fixture class, which sometimes is too wordy. The
@@ -406,7 +406,7 @@ be used in such cases to restore/set values.
406406

407407
Caveats:
408408

409-
* Changing a flags value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
409+
* Changing a flag's value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
410410

411411
* `FLAG_SET_*` macros can change more than one flag (in order to
412412
maintain invariants) so it is hard to predict what flags will be

src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
8787
__ mv(t1, _array->as_pointer_register());
8888
stub_id = C1StubId::throw_range_check_failed_id;
8989
}
90-
// t0 and t1 are used as args in generate_exception_throw
90+
// t0 and t1 are used as args in generate_exception_throw,
9191
// so use x1/ra as the tmp register for rt_call.
9292
__ rt_call(Runtime1::entry_for(stub_id), ra);
9393
ce->add_call_info_here(_info);

src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
275275
// order, while allowing other independent instructions to be reordered.
276276
// Note: This may be slower than using a membar(load|load) (fence r,r).
277277
// Because processors will not start the second load until the first comes back.
278-
// This means you cant overlap the two loads,
278+
// This means you can't overlap the two loads,
279279
// which is stronger than needed for ordering (stronger than TSO).
280280
__ srli(ra, t0, 32);
281281
__ orr(t1, t1, ra);

src/hotspot/cpu/riscv/macroAssembler_riscv.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,9 @@ class MacroAssembler: public Assembler {
670670
// JALR, return address stack updates:
671671
// | rd is x1/x5 | rs1 is x1/x5 | rd=rs1 | RAS action
672672
// | ----------- | ------------ | ------ |-------------
673-
// | No | No | | None
674-
// | No | Yes | | Pop
675-
// | Yes | No | | Push
673+
// | No | No | - | None
674+
// | No | Yes | - | Pop
675+
// | Yes | No | - | Push
676676
// | Yes | Yes | No | Pop, then push
677677
// | Yes | Yes | Yes | Push
678678
//

src/hotspot/cpu/s390/disassembler_s390.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ address Disassembler::decode_instruction0(address here, outputStream * st, addre
6262

6363
if (Assembler::is_z_nop((long)instruction_2bytes)) {
6464
#if 1
65-
st->print("nop "); // fill up to operand column, leads to better code comment alignment
65+
st->print("nop "); // fill up to operand column, leads to better code comment alignment
6666
next = here + 2;
6767
#else
6868
// Compact disassembler output. Does not work the easy way.
@@ -76,7 +76,7 @@ address Disassembler::decode_instruction0(address here, outputStream * st, addre
7676
instruction_2bytes = *(uint16_t*)(here+2*n_nops);
7777
}
7878
if (n_nops <= 4) { // do not group few subsequent nops
79-
st->print("nop "); // fill up to operand column, leads to better code comment alignment
79+
st->print("nop "); // fill up to operand column, leads to better code comment alignment
8080
next = here + 2;
8181
} else {
8282
st->print("nop count=%d", n_nops);

src/hotspot/cpu/s390/s390.ad

+1-1
Original file line numberDiff line numberDiff line change
@@ -6581,7 +6581,7 @@ instruct mulHiL_reg_reg(revenRegL Rdst, roddRegL Rsrc1, iRegL Rsrc2, iRegL Rtmp1
65816581
Register tmp1 = $Rtmp1$$Register;
65826582
Register tmp2 = $Rdst$$Register;
65836583
// z/Architecture has only unsigned multiply (64 * 64 -> 128).
6584-
// implementing mulhs(a,b) = mulhu(a,b) (a & (b>>63)) (b & (a>>63))
6584+
// implementing mulhs(a,b) = mulhu(a,b) - (a & (b>>63)) - (b & (a>>63))
65856585
__ z_srag(tmp2, src1, 63); // a>>63
65866586
__ z_srag(tmp1, src2, 63); // b>>63
65876587
__ z_ngr(tmp2, src2); // b & (a>>63)

src/hotspot/os/aix/libperfstat_aix.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ typedef struct { /* component perfstat_cpu_t from AIX 7.2 documentation */
332332
u_longlong_t busy_stolen_purr; /* Number of busy cycles stolen by the hypervisor from a dedicated partition. */
333333
u_longlong_t busy_stolen_spurr; /* Number of busy spurr cycles stolen by the hypervisor from a dedicated partition.*/
334334
u_longlong_t shcpus_in_sys; /* Number of physical processors allocated for shared processor use, across all shared processors pools. */
335-
u_longlong_t entitled_pool_capacity; /* Entitled processor capacity of partitions pool. */
335+
u_longlong_t entitled_pool_capacity; /* Entitled processor capacity of partition's pool. */
336336
u_longlong_t pool_max_time; /* Summation of maximum time that can be consumed by the pool (nanoseconds). */
337337
u_longlong_t pool_busy_time; /* Summation of busy (nonidle) time accumulated across all partitions in the pool (nanoseconds). */
338338
u_longlong_t pool_scaled_busy_time; /* Scaled summation of busy (nonidle) time accumulated across all partitions in the pool (nanoseconds). */

src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ DECLARE_FUNC(aarch64_atomic_cmpxchg_8_relaxed_default_impl):
295295
ret
296296

297297
/* Emit .note.gnu.property section in case of PAC or BTI being enabled.
298-
* For more details see "ELF for the Arm® 64-bit Architecture (AArch64)".
298+
* For more details see "ELF for the Arm(R) 64-bit Architecture (AArch64)".
299299
* https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
300300
*/
301301
#ifdef __ARM_FEATURE_BTI_DEFAULT

src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ bwd_copy_drain:
269269
ret
270270

271271
/* Emit .note.gnu.property section in case of PAC or BTI being enabled.
272-
* For more details see "ELF for the Arm® 64-bit Architecture (AArch64)".
272+
* For more details see "ELF for the Arm(R) 64-bit Architecture (AArch64)".
273273
* https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
274274
*/
275275
#ifdef __ARM_FEATURE_BTI_DEFAULT

src/hotspot/os_cpu/linux_aarch64/safefetch_linux_aarch64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ DECLARE_FUNC(_SafeFetchN_continuation):
5050
ret
5151

5252
/* Emit .note.gnu.property section in case of PAC or BTI being enabled.
53-
* For more details see "ELF for the Arm® 64-bit Architecture (AArch64)".
53+
* For more details see "ELF for the Arm(R) 64-bit Architecture (AArch64)".
5454
* https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
5555
*/
5656
#ifdef __ARM_FEATURE_BTI_DEFAULT

src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ DECLARE_FUNC(_ZN10JavaThread25aarch64_get_thread_helperEv):
4646
.size _ZN10JavaThread25aarch64_get_thread_helperEv, .-_ZN10JavaThread25aarch64_get_thread_helperEv
4747

4848
/* Emit .note.gnu.property section in case of PAC or BTI being enabled.
49-
* For more details see "ELF for the Arm® 64-bit Architecture (AArch64)".
49+
* For more details see "ELF for the Arm(R) 64-bit Architecture (AArch64)".
5050
* https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
5151
*/
5252
#ifdef __ARM_FEATURE_BTI_DEFAULT

src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ inline void OrderAccess::fence() {
5454
}
5555

5656
inline void OrderAccess::cross_modify_fence_impl() {
57-
// From 3 Zifencei Instruction-Fetch Fence, Version 2.0
57+
// From 3 "Zifencei" Instruction-Fetch Fence, Version 2.0
5858
// "RISC-V does not guarantee that stores to instruction memory will be made
5959
// visible to instruction fetches on a RISC-V hart until that hart executes a
6060
// FENCE.I instruction. A FENCE.I instruction ensures that a subsequent
6161
// instruction fetch on a RISC-V hart will see any previous data stores
6262
// already visible to the same RISC-V hart. FENCE.I does not ensure that other
63-
// RISC-V harts instruction fetches will observe the local harts stores in a
63+
// RISC-V harts' instruction fetches will observe the local hart's stores in a
6464
// multiprocessor system."
6565
//
6666
// Hence to be able to use fence.i directly we need a kernel that supports

src/hotspot/share/cds/archiveUtils.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class ArchivePtrMarker : AllStatic {
106106
// within the archive (e.g., InstanceKlass::_name points to a Symbol in the archive). During dumping, we
107107
// built a bitmap that marks the locations of all these pointers (using ArchivePtrMarker, see comments above).
108108
//
109-
// The contents of the archive assumes that its mapped at the default SharedBaseAddress (e.g. 0x800000000).
109+
// The contents of the archive assumes that it's mapped at the default SharedBaseAddress (e.g. 0x800000000).
110110
// If the archive ends up being mapped at a different address (e.g. 0x810000000), SharedDataRelocator
111111
// is used to shift each marked pointer by a delta (0x10000000 in this example), so that it points to
112112
// the actually mapped location of the target object.

src/hotspot/share/oops/method.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ void Method::set_itable_index(int index) {
433433
// itable index should be the same as the runtime index.
434434
assert(_vtable_index == itable_index_max - index,
435435
"archived itable index is different from runtime index");
436-
return; // dont write into the shared class
436+
return; // don't write into the shared class
437437
} else {
438438
_vtable_index = itable_index_max - index;
439439
}

test/hotspot/gtest/gc/g1/test_g1CardSet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class G1CardSetTest : public ::testing::Test {
7070
~G1CardSetTest() { }
7171

7272
static uint next_random(uint& seed, uint i) {
73-
// ParkMiller random number generator
73+
// Park-Miller random number generator
7474
seed = (seed * 279470273u) % 0xfffffffb;
7575
return (seed % i);
7676
}

test/hotspot/gtest/runtime/test_os_windows.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ void TestReserveMemorySpecial_test() {
8282
// Instead try reserving after the first reservation.
8383
expected_location = result + large_allocation_size;
8484
actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, false);
85-
EXPECT_TRUE(actual_location != nullptr) << "Unexpected reservation failure, cant verify correct location";
85+
EXPECT_TRUE(actual_location != nullptr) << "Unexpected reservation failure, can't verify correct location";
8686
EXPECT_TRUE(actual_location == expected_location) << "Reservation must be at requested location";
8787
MemoryReleaser m2(actual_location, os::large_page_size());
8888

8989
// Now try to do a reservation with a larger alignment.
9090
const size_t alignment = os::large_page_size() * 2;
9191
const size_t new_large_size = alignment * 4;
9292
char* aligned_request = os::reserve_memory_special(new_large_size, alignment, os::large_page_size(), nullptr, false);
93-
EXPECT_TRUE(aligned_request != nullptr) << "Unexpected reservation failure, cant verify correct alignment";
93+
EXPECT_TRUE(aligned_request != nullptr) << "Unexpected reservation failure, can't verify correct alignment";
9494
EXPECT_TRUE(is_aligned(aligned_request, alignment)) << "Returned address must be aligned";
9595
MemoryReleaser m3(aligned_request, new_large_size);
9696
}

test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,22 @@ void runControlFlowTests() {
191191
static void testAllocateThenAtomic(Inner i) {
192192
Outer o = new Outer();
193193
Common.blackhole(o);
194-
Common.field1VarHandle.getAndSet(o, i);
194+
Common.field1VarHandle.getAndSet(o, i);
195195
}
196196

197197
@Test
198198
@IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
199199
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
200200
static void testLoadThenAtomic(Outer o, Inner i) {
201201
Common.blackhole(o.field1);
202-
Common.field1VarHandle.getAndSet(o, i);
202+
Common.field1VarHandle.getAndSet(o, i);
203203
}
204204

205205
@Test
206206
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
207207
static void testAtomicThenAtomicAnotherField(Outer o, Inner i) {
208-
Common.field1VarHandle.getAndSet(o, i);
209-
Common.field2VarHandle.getAndSet(o, i);
208+
Common.field1VarHandle.getAndSet(o, i);
209+
Common.field2VarHandle.getAndSet(o, i);
210210
}
211211

212212
@Test
@@ -390,31 +390,31 @@ void runControlFlowTests() {
390390
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
391391
static void testStoreThenAtomic(Outer o, Inner i) {
392392
o.field1 = i;
393-
Common.field1VarHandle.getAndSet(o, i);
393+
Common.field1VarHandle.getAndSet(o, i);
394394
}
395395

396396
@Test
397397
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
398398
@IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
399399
static void testAtomicThenLoad(Outer o, Inner i) {
400-
Common.field1VarHandle.getAndSet(o, i);
400+
Common.field1VarHandle.getAndSet(o, i);
401401
Common.blackhole(o.field1);
402402
}
403403

404404
@Test
405405
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
406406
@IR(counts = { IRNode.Z_STORE_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
407407
static void testAtomicThenStore(Outer o, Inner i) {
408-
Common.field1VarHandle.getAndSet(o, i);
408+
Common.field1VarHandle.getAndSet(o, i);
409409
o.field1 = i;
410410
}
411411

412412
@Test
413413
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
414414
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
415415
static void testAtomicThenAtomic(Outer o, Inner i) {
416-
Common.field1VarHandle.getAndSet(o, i);
417-
Common.field1VarHandle.getAndSet(o, i);
416+
Common.field1VarHandle.getAndSet(o, i);
417+
Common.field1VarHandle.getAndSet(o, i);
418418
}
419419

420420
@Test

test/hotspot/jtreg/compiler/lib/generators/Generators.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
* <p>
101101
* Unless you have reasons to pick a specific distribution, you are encouraged to rely on {@link #ints()},
102102
* {@link #longs()}, {@link #doubles()} and {@link #floats()}, which will randomly pick an interesting distribution.
103-
* This is best practice, because that allows the test to be run under different conditions maybe only a single
103+
* This is best practice, because that allows the test to be run under different conditions - maybe only a single
104104
* distribution can trigger a bug.
105105
*/
106106
public final class Generators {

test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -435,15 +435,15 @@ enum NumberType {
435435
this.rndFnc = rndFnc;
436436
}
437437

438-
public String getСType() {
438+
public String getCType() {
439439
return cType;
440440
}
441441

442442
public String getJType() {
443443
return jType;
444444
}
445445

446-
public String getСConv() {
446+
public String getCConv() {
447447
return cConv;
448448
}
449449

@@ -792,9 +792,9 @@ class ParameterListGenerator {
792792

793793
String randomVal = list.get(type).getFnc();
794794

795-
String ctype = list.get(type).getСType();
795+
String ctype = list.get(type).getCType();
796796
String jtype = list.get(type).getJType();
797-
String cconv = list.get(type).getСConv();
797+
String cconv = list.get(type).getCConv();
798798
String jconv = list.get(type).getJConv();
799799

800800
String varName = "p" + cnt;

test/jdk/java/awt/image/DrawImage/TiledImage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
* This bug is largely unnoticed because most {@code Raster.create}
9292
* methods actually create {@link WritableRaster} instances, even
9393
* when the user did not asked for writable raster. To make this
94-
* bug apparent, we need to invoke {@code Raster.createRaster()}
94+
* bug apparent, we need to invoke {@code Raster.createRaster(...)}
9595
* with a sample model for which no optimization is provided.
9696
*/
9797
public class TiledImage implements RenderedImage {

test/jdk/jdk/jfr/tool/jfr.xsd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.0">
33
<xs:element name="recording">
44
<xs:complexType>
@@ -78,4 +78,4 @@
7878
</xs:extension>
7979
</xs:simpleContent>
8080
</xs:complexType>
81-
</xs:schema>
81+
</xs:schema>

0 commit comments

Comments
 (0)