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

Jump to bottom

[GR-58969] Incorrect object header size in native image debuginfo. #9882

Merged
merged 1 commit into from
Oct 16, 2024
+4 −14
Merged

[GR-58969] Incorrect object header size in native image debuginfo. #9882

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
18 changes: 4 additions & 14 deletions ...c/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,22 +430,12 @@ private Stream<DebugTypeInfo> computeHeaderTypeInfo() {

List<DebugTypeInfo> infos = new LinkedList<>();
int hubOffset = ol.getHubOffset();
int hubFieldSize = referenceSize;
int objHeaderSize = hubOffset + hubFieldSize;

int idHashSize = ol.sizeInBytes(JavaKind.Int);
int fixedIdHashOffset = -1;
NativeImageHeaderTypeInfo objHeader = new NativeImageHeaderTypeInfo("_objhdr", ol.getFirstFieldOffset());
objHeader.addField("hub", hubType, hubOffset, referenceSize);
if (ol.isIdentityHashFieldInObjectHeader()) {
fixedIdHashOffset = ol.getObjectHeaderIdentityHashOffset();
objHeaderSize = Math.max(objHeaderSize, fixedIdHashOffset + idHashSize);
}

/* We need array headers for all Java kinds */

NativeImageHeaderTypeInfo objHeader = new NativeImageHeaderTypeInfo("_objhdr", objHeaderSize);
objHeader.addField("hub", hubType, hubOffset, hubFieldSize);
if (fixedIdHashOffset >= 0) {
objHeader.addField("idHash", javaKindToHostedType.get(JavaKind.Int), fixedIdHashOffset, idHashSize);
int idHashSize = ol.sizeInBytes(JavaKind.Int);
objHeader.addField("idHash", javaKindToHostedType.get(JavaKind.Int), ol.getObjectHeaderIdentityHashOffset(), idHashSize);
}
infos.add(objHeader);

Expand Down
Loading