Skip to content

Commit 4f7decd

Browse files
committed
Remove last use of the default value
1 parent 293a9c4 commit 4f7decd

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrayNullMarkers.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ public MyClass(int x) {
176176
}
177177
}
178178

179-
@ImplicitlyConstructible
180179
@LooselyConsistentValue
181180
static value class IntAndArrayOop {
182181
int i;
@@ -186,6 +185,8 @@ public IntAndArrayOop(int i, MyClass[] array) {
186185
this.i = i;
187186
this.array = array;
188187
}
188+
189+
static final IntAndArrayOop DEFAULT = new IntAndArrayOop(0, null);
189190
}
190191

191192
public static void testWrite0(OneByte[] array, int i, OneByte val) {
@@ -778,8 +779,7 @@ public static void main(String[] args) {
778779
ByteAndOop[] nullableArray5 = new ByteAndOop[3];
779780
ByteAndOop[] nullableAtomicArray5 = (ByteAndOop[])ValueClass.newNullableAtomicArray(ByteAndOop.class, 3);
780781

781-
IntAndArrayOop[] nullFreeArray6 = (IntAndArrayOop[])ValueClass.newNullRestrictedArray(IntAndArrayOop.class, 3);
782-
IntAndArrayOop[] nullFreeAtomicArray6 = (IntAndArrayOop[])ValueClass.newNullRestrictedAtomicArray(IntAndArrayOop.class, 3);
782+
IntAndArrayOop[] nullFreeAtomicArray6 = (IntAndArrayOop[])ValueClass.newNullRestrictedAtomicArray(IntAndArrayOop.class, 3, IntAndArrayOop.DEFAULT);
783783
IntAndArrayOop[] nullableArray6 = new IntAndArrayOop[3];
784784
IntAndArrayOop[] nullableAtomicArray6 = (IntAndArrayOop[])ValueClass.newNullableAtomicArray(IntAndArrayOop.class, 3);
785785

@@ -963,23 +963,18 @@ public static void main(String[] args) {
963963
testWrite5(nullableAtomicArray5, 1, val5);
964964

965965
IntAndArrayOop val6 = new IntAndArrayOop(i, new MyClass[1]);
966-
nullFreeArray6[1] = val6;
967-
nullFreeArray6[2] = nullFreeArray6[1];
968966
nullFreeAtomicArray6[1] = val6;
969967
nullFreeAtomicArray6[2] = nullFreeAtomicArray6[1];
970968
nullableArray6[1] = val6;
971969
nullableArray6[2] = nullableArray6[1];
972970
nullableAtomicArray6[1] = val6;
973971
nullableAtomicArray6[2] = nullableAtomicArray6[1];
974-
Asserts.assertEQ(nullFreeArray6[0], new IntAndArrayOop(0, null));
975972
Asserts.assertEQ(nullFreeAtomicArray6[0], new IntAndArrayOop(0, null));
976973
Asserts.assertEQ(nullableArray6[0], null);
977974
Asserts.assertEQ(nullableAtomicArray6[0], null);
978-
Asserts.assertEQ(nullFreeArray6[1], val6);
979975
Asserts.assertEQ(nullFreeAtomicArray6[1], val6);
980976
Asserts.assertEQ(nullableArray6[1], val6);
981977
Asserts.assertEQ(nullableAtomicArray6[1], val6);
982-
Asserts.assertEQ(nullFreeArray6[2], val6);
983978
Asserts.assertEQ(nullFreeAtomicArray6[2], val6);
984979
Asserts.assertEQ(nullableArray6[2], val6);
985980
Asserts.assertEQ(nullableAtomicArray6[2], val6);

0 commit comments

Comments
 (0)