Skip to content

Commit b2f4bfe

Browse files
author
duke
committed
Automatic merge of jdk:master into master
2 parents 129b88e + 2da9981 commit b2f4bfe

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/jdk.unsupported/share/classes/sun/misc/Unsafe.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ public void freeMemory(long address) {
636636
* @see #getInt(Object, long)
637637
*/
638638
@ForceInline
639-
@SuppressWarnings("preview")
640639
public long objectFieldOffset(Field f) {
641640
if (f == null) {
642641
throw new NullPointerException();
@@ -646,7 +645,7 @@ public long objectFieldOffset(Field f) {
646645
throw new UnsupportedOperationException("can't get field offset on a hidden class: " + f);
647646
}
648647
if (declaringClass.isRecord()) {
649-
throw new UnsupportedOperationException("can't get field offset on a record (preview): " + f);
648+
throw new UnsupportedOperationException("can't get field offset on a record class: " + f);
650649
}
651650
return theInternalUnsafe.objectFieldOffset(f);
652651
}
@@ -669,7 +668,6 @@ public long objectFieldOffset(Field f) {
669668
* @see #getInt(Object, long)
670669
*/
671670
@ForceInline
672-
@SuppressWarnings("preview")
673671
public long staticFieldOffset(Field f) {
674672
if (f == null) {
675673
throw new NullPointerException();
@@ -679,7 +677,7 @@ public long staticFieldOffset(Field f) {
679677
throw new UnsupportedOperationException("can't get field offset on a hidden class: " + f);
680678
}
681679
if (declaringClass.isRecord()) {
682-
throw new UnsupportedOperationException("can't get field offset on a record (preview): " + f);
680+
throw new UnsupportedOperationException("can't get field offset on a record class: " + f);
683681
}
684682
return theInternalUnsafe.staticFieldOffset(f);
685683
}
@@ -695,7 +693,6 @@ public long staticFieldOffset(Field f) {
695693
* this class.
696694
*/
697695
@ForceInline
698-
@SuppressWarnings("preview")
699696
public Object staticFieldBase(Field f) {
700697
if (f == null) {
701698
throw new NullPointerException();
@@ -705,7 +702,7 @@ public Object staticFieldBase(Field f) {
705702
throw new UnsupportedOperationException("can't get base address on a hidden class: " + f);
706703
}
707704
if (declaringClass.isRecord()) {
708-
throw new UnsupportedOperationException("can't get base address on a record (preview): " + f);
705+
throw new UnsupportedOperationException("can't get base address on a record class: " + f);
709706
}
710707
return theInternalUnsafe.staticFieldBase(f);
711708
}

0 commit comments

Comments
 (0)