Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK25 changes Unsafe base offset from int to long #21046

Merged
merged 1 commit into from
Jan 31, 2025
+44 −0
Merged

JDK25 changes Unsafe base offset from int to long #21046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions jcl/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,52 +45,92 @@ private Unsafe() {}
/**
* Represents an invalid field offset value.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long INVALID_FIELD_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int INVALID_FIELD_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of byte array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_BYTE_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_BYTE_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of int array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_INT_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_INT_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of long array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_LONG_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_LONG_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of float array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_FLOAT_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_FLOAT_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of double array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_DOUBLE_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_DOUBLE_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of short array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_SHORT_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_SHORT_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of char array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_CHAR_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_CHAR_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of boolean array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_BOOLEAN_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_BOOLEAN_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Starting offset of Object array.
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public static final long ARRAY_OBJECT_BASE_OFFSET;
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public static final int ARRAY_OBJECT_BASE_OFFSET;
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */

/**
* Index size of byte array in bytes.
Expand Down Expand Up @@ -1565,7 +1605,11 @@ public void ensureClassInitialized(Class<?> c) {
* @throws NullPointerException if the class parameter is null
* @throws IllegalArgumentException if class is not an array
*/
/*[IF JAVA_SPEC_VERSION >= 25]*/
public long arrayBaseOffset(Class<?> c) {
/*[ELSE] JAVA_SPEC_VERSION >= 25 */
public int arrayBaseOffset(Class<?> c) {
/*[ENDIF] JAVA_SPEC_VERSION >= 25 */
Objects.requireNonNull(c);
return arrayBaseOffset0(c);
}
Expand Down