Skip to content

Commit ec34f8b

Browse files
coffeyscoffeys
committed
Merge
2 parents 352a7a9 + 6705a92 commit ec34f8b

File tree

10 files changed

+646
-2657
lines changed

10 files changed

+646
-2657
lines changed

‎src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,9 @@ static const Node* get_base_and_offset(const MachNode* mach, intptr_t& offset) {
559559
// The memory address is computed by 'base' and fed to 'mach' via an
560560
// indirect memory operand (indicated by offset == 0). The ultimate base and
561561
// offset can be fetched directly from the inputs and Ideal type of 'base'.
562-
offset = base->bottom_type()->isa_oopptr()->offset();
562+
const TypeOopPtr* oopptr = base->bottom_type()->isa_oopptr();
563+
if (oopptr == nullptr) return nullptr;
564+
offset = oopptr->offset();
563565
// Even if 'base' is not an Ideal AddP node anymore, Matcher::ReduceInst()
564566
// guarantees that the base address is still available at the same slot.
565567
base = base->in(AddPNode::Base);

‎src/java.base/share/classes/java/lang/AbstractStringBuilder.java‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,14 @@ private AbstractStringBuilder appendNull() {
640640
int count = this.count;
641641
byte[] val = this.value;
642642
if (isLatin1()) {
643-
StringLatin1.putCharsAt(val, count, 'n', 'u', 'l', 'l');
643+
val[count++] = 'n';
644+
val[count++] = 'u';
645+
val[count++] = 'l';
646+
val[count++] = 'l';
644647
} else {
645-
StringUTF16.putCharsAt(val, count, 'n', 'u', 'l', 'l');
648+
count = StringUTF16.putCharsAt(val, count, 'n', 'u', 'l', 'l');
646649
}
647-
this.count = count + 4;
650+
this.count = count;
648651
return this;
649652
}
650653

@@ -769,18 +772,25 @@ public AbstractStringBuilder append(boolean b) {
769772
byte[] val = this.value;
770773
if (isLatin1()) {
771774
if (b) {
772-
StringLatin1.putCharsAt(val, count, 't', 'r', 'u', 'e');
775+
val[count++] = 't';
776+
val[count++] = 'r';
777+
val[count++] = 'u';
778+
val[count++] = 'e';
773779
} else {
774-
StringLatin1.putCharsAt(val, count, 'f', 'a', 'l', 's', 'e');
780+
val[count++] = 'f';
781+
val[count++] = 'a';
782+
val[count++] = 'l';
783+
val[count++] = 's';
784+
val[count++] = 'e';
775785
}
776786
} else {
777787
if (b) {
778-
StringUTF16.putCharsAt(val, count, 't', 'r', 'u', 'e');
788+
count = StringUTF16.putCharsAt(val, count, 't', 'r', 'u', 'e');
779789
} else {
780-
StringUTF16.putCharsAt(val, count, 'f', 'a', 'l', 's', 'e');
790+
count = StringUTF16.putCharsAt(val, count, 'f', 'a', 'l', 's', 'e');
781791
}
782792
}
783-
this.count = count + (b ? 4 : 5);
793+
this.count = count;
784794
return this;
785795
}
786796

‎src/java.base/share/classes/java/lang/StringConcatHelper.java‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,35 @@ static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
236236
if (indexCoder < UTF16) {
237237
if (value) {
238238
index -= 4;
239-
StringLatin1.putCharsAt(buf, index, 't', 'r', 'u', 'e');
239+
buf[index] = 't';
240+
buf[index + 1] = 'r';
241+
buf[index + 2] = 'u';
242+
buf[index + 3] = 'e';
240243
} else {
241244
index -= 5;
242-
StringLatin1.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
245+
buf[index] = 'f';
246+
buf[index + 1] = 'a';
247+
buf[index + 2] = 'l';
248+
buf[index + 3] = 's';
249+
buf[index + 4] = 'e';
243250
}
244251
index -= prefix.length();
245252
prefix.getBytes(buf, index, String.LATIN1);
246253
return index;
247254
} else {
248255
if (value) {
249256
index -= 4;
250-
StringUTF16.putCharsAt(buf, index, 't', 'r', 'u', 'e');
257+
StringUTF16.putChar(buf, index, 't');
258+
StringUTF16.putChar(buf, index + 1, 'r');
259+
StringUTF16.putChar(buf, index + 2, 'u');
260+
StringUTF16.putChar(buf, index + 3, 'e');
251261
} else {
252262
index -= 5;
253-
StringUTF16.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
263+
StringUTF16.putChar(buf, index, 'f');
264+
StringUTF16.putChar(buf, index + 1, 'a');
265+
StringUTF16.putChar(buf, index + 2, 'l');
266+
StringUTF16.putChar(buf, index + 3, 's');
267+
StringUTF16.putChar(buf, index + 4, 'e');
254268
}
255269
index -= prefix.length();
256270
prefix.getBytes(buf, index, String.UTF16);
@@ -624,20 +638,34 @@ static int prepend(int index, byte coder, byte[] buf, boolean value, String pref
624638
if (coder == String.LATIN1) {
625639
if (value) {
626640
index -= 4;
627-
StringLatin1.putCharsAt(buf, index, 't', 'r', 'u', 'e');
641+
buf[index] = 't';
642+
buf[index + 1] = 'r';
643+
buf[index + 2] = 'u';
644+
buf[index + 3] = 'e';
628645
} else {
629646
index -= 5;
630-
StringLatin1.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
647+
buf[index] = 'f';
648+
buf[index + 1] = 'a';
649+
buf[index + 2] = 'l';
650+
buf[index + 3] = 's';
651+
buf[index + 4] = 'e';
631652
}
632653
index -= prefix.length();
633654
prefix.getBytes(buf, index, String.LATIN1);
634655
} else {
635656
if (value) {
636657
index -= 4;
637-
StringUTF16.putCharsAt(buf, index, 't', 'r', 'u', 'e');
658+
StringUTF16.putChar(buf, index, 't');
659+
StringUTF16.putChar(buf, index + 1, 'r');
660+
StringUTF16.putChar(buf, index + 2, 'u');
661+
StringUTF16.putChar(buf, index + 3, 'e');
638662
} else {
639663
index -= 5;
640-
StringUTF16.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
664+
StringUTF16.putChar(buf, index, 'f');
665+
StringUTF16.putChar(buf, index + 1, 'a');
666+
StringUTF16.putChar(buf, index + 2, 'l');
667+
StringUTF16.putChar(buf, index + 3, 's');
668+
StringUTF16.putChar(buf, index + 4, 'e');
641669
}
642670
index -= prefix.length();
643671
prefix.getBytes(buf, index, String.UTF16);

‎src/java.base/share/classes/java/lang/StringLatin1.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.function.IntConsumer;
3333
import java.util.stream.Stream;
3434
import java.util.stream.StreamSupport;
35-
import jdk.internal.misc.Unsafe;
3635
import jdk.internal.util.ArraysSupport;
3736
import jdk.internal.util.DecimalDigits;
3837
import jdk.internal.vm.annotation.IntrinsicCandidate;
@@ -43,8 +42,6 @@
4342
import static java.lang.String.checkOffset;
4443

4544
final class StringLatin1 {
46-
private static final Unsafe UNSAFE = Unsafe.getUnsafe();
47-
4845
public static char charAt(byte[] value, int index) {
4946
checkIndex(index, value.length);
5047
return (char)(value[index] & 0xff);
@@ -827,27 +824,6 @@ static Stream<String> lines(byte[] value) {
827824
return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
828825
}
829826

830-
static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4) {
831-
assert index >= 0 && index + 3 < length(val) : "Trusted caller missed bounds check";
832-
// Don't use the putChar method, Its instrinsic will cause C2 unable to combining values into larger stores.
833-
long offset = (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
834-
UNSAFE.putByte(val, offset , (byte)(c1));
835-
UNSAFE.putByte(val, offset + 1, (byte)(c2));
836-
UNSAFE.putByte(val, offset + 2, (byte)(c3));
837-
UNSAFE.putByte(val, offset + 3, (byte)(c4));
838-
}
839-
840-
static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4, int c5) {
841-
assert index >= 0 && index + 4 < length(val) : "Trusted caller missed bounds check";
842-
// Don't use the putChar method, Its instrinsic will cause C2 unable to combining values into larger stores.
843-
long offset = (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
844-
UNSAFE.putByte(val, offset , (byte)(c1));
845-
UNSAFE.putByte(val, offset + 1, (byte)(c2));
846-
UNSAFE.putByte(val, offset + 2, (byte)(c3));
847-
UNSAFE.putByte(val, offset + 3, (byte)(c4));
848-
UNSAFE.putByte(val, offset + 4, (byte)(c5));
849-
}
850-
851827
public static void putChar(byte[] val, int index, int c) {
852828
//assert (canEncode(c));
853829
val[index] = (byte)(c);

‎src/java.base/share/classes/java/lang/StringUTF16.java‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static java.lang.String.LATIN1;
4444

4545
final class StringUTF16 {
46+
4647
// Return a new byte array for a UTF16-coded string for len chars
4748
// Throw an exception if out of range
4849
public static byte[] newBytesFor(int len) {
@@ -1547,20 +1548,27 @@ public static boolean contentEquals(byte[] value, CharSequence cs, int len) {
15471548
return true;
15481549
}
15491550

1550-
static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4) {
1551-
assert index >= 0 && index + 3 < length(val) : "Trusted caller missed bounds check";
1552-
putChar(val, index , c1);
1553-
putChar(val, index + 1, c2);
1554-
putChar(val, index + 2, c3);
1555-
putChar(val, index + 3, c4);
1556-
}
1557-
1558-
static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4, int c5) {
1559-
putChar(val, index , c1);
1560-
putChar(val, index + 1, c2);
1561-
putChar(val, index + 2, c3);
1562-
putChar(val, index + 3, c4);
1563-
putChar(val, index + 4, c5);
1551+
public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
1552+
int end = i + 4;
1553+
checkBoundsBeginEnd(i, end, value);
1554+
putChar(value, i++, c1);
1555+
putChar(value, i++, c2);
1556+
putChar(value, i++, c3);
1557+
putChar(value, i++, c4);
1558+
assert(i == end);
1559+
return end;
1560+
}
1561+
1562+
public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
1563+
int end = i + 5;
1564+
checkBoundsBeginEnd(i, end, value);
1565+
putChar(value, i++, c1);
1566+
putChar(value, i++, c2);
1567+
putChar(value, i++, c3);
1568+
putChar(value, i++, c4);
1569+
putChar(value, i++, c5);
1570+
assert(i == end);
1571+
return end;
15641572
}
15651573

15661574
public static char charAt(byte[] value, int index) {

‎test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -133,17 +133,11 @@ public static boolean contentEquals(byte[] value, CharSequence cs, int len) {
133133
}
134134

135135
public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
136-
int end = i + 4;
137-
StringUTF16.checkBoundsBeginEnd(i, end, value);
138-
StringUTF16.putCharsAt(value, i, c1, c2, c3, c4);
139-
return end;
136+
return StringUTF16.putCharsAt(value, i, c1, c2, c3, c4);
140137
}
141138

142139
public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
143-
int end = i + 5;
144-
StringUTF16.checkBoundsBeginEnd(i, end, value);
145-
StringUTF16.putCharsAt(value, i, c1, c2, c3, c4, c5);
146-
return end;
140+
return StringUTF16.putCharsAt(value, i, c1, c2, c3, c4, c5);
147141
}
148142

149143
public static char charAt(byte[] value, int index) {

‎test/micro/org/openjdk/bench/java/lang/StringBuilders.java‎

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -226,66 +226,17 @@ public String toStringCharWithInt8() {
226226

227227

228228
@Benchmark
229-
public int appendWithBool8Latin1() {
230-
StringBuilder buf = sbLatin1;
231-
buf.setLength(0);
232-
buf.append(true);
233-
buf.append(false);
234-
buf.append(true);
235-
buf.append(true);
236-
buf.append(false);
237-
buf.append(true);
238-
buf.append(false);
239-
buf.append(false);
240-
return buf.length();
241-
}
242-
243-
244-
@Benchmark
245-
public int appendWithBool8Utf16() {
246-
StringBuilder buf = sbUtf16;
247-
buf.setLength(0);
248-
buf.append(true);
249-
buf.append(false);
250-
buf.append(true);
251-
buf.append(true);
252-
buf.append(false);
253-
buf.append(true);
254-
buf.append(false);
255-
buf.append(false);
256-
return buf.length();
257-
}
258-
259-
260-
@Benchmark
261-
public int appendWithNull8Latin1() {
262-
StringBuilder buf = sbLatin1;
263-
buf.setLength(0);
264-
buf.append((String) null);
265-
buf.append((String) null);
266-
buf.append((String) null);
267-
buf.append((String) null);
268-
buf.append((String) null);
269-
buf.append((String) null);
270-
buf.append((String) null);
271-
buf.append((String) null);
272-
return buf.length();
273-
}
274-
275-
276-
@Benchmark
277-
public int appendWithNull8Utf16() {
278-
StringBuilder buf = sbUtf16;
279-
buf.setLength(0);
280-
buf.append((String) null);
281-
buf.append((String) null);
282-
buf.append((String) null);
283-
buf.append((String) null);
284-
buf.append((String) null);
285-
buf.append((String) null);
286-
buf.append((String) null);
287-
buf.append((String) null);
288-
return buf.length();
229+
public String toStringCharWithBool8() {
230+
StringBuilder result = new StringBuilder();
231+
result.append(true);
232+
result.append(false);
233+
result.append(true);
234+
result.append(true);
235+
result.append(false);
236+
result.append(true);
237+
result.append(false);
238+
result.append(false);
239+
return result.toString();
289240
}
290241

291242

0 commit comments

Comments
 (0)