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

7903616: Bad formatting of layout string for structs with nested anon structs/unions #170

Closed
wants to merge 3 commits into from
+18 −17
Closed

7903616: Bad formatting of layout string for structs with nested anon structs/unions #170

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c34a3b6
Initial push
mcimadamore Dec 21, 2023
1e6bf58
Fix indentation of padding layout strings nested inside struct layouts
mcimadamore Dec 21, 2023
a0c2398
Remove redundant trailing semi
mcimadamore Dec 22, 2023
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
10 changes: 5 additions & 5 deletions src/main/java/org/openjdk/jextract/impl/ClassSourceBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -250,9 +250,9 @@ private String primitiveLayoutString(Primitive primitiveType, long align) {
case Double -> alignIfNeeded(STR."\{runtimeHelperName()}.C_DOUBLE", 8, align);
case LongDouble -> TypeImpl.IS_WINDOWS ?
alignIfNeeded(STR."\{runtimeHelperName()}.C_LONG_DOUBLE", 8, align) :
paddingLayoutString(8);
case HalfFloat, Char16, WChar -> paddingLayoutString(2); // unsupported
case Float128, Int128 -> paddingLayoutString(16); // unsupported
paddingLayoutString(8, 0);
case HalfFloat, Char16, WChar -> paddingLayoutString(2, 0); // unsupported
case Float128, Int128 -> paddingLayoutString(16, 0); // unsupported
default -> throw new UnsupportedOperationException(primitiveType.toString());
};
}
@@ -263,7 +263,7 @@ private String alignIfNeeded(String layoutPrefix, long align, long expectedAlign
layoutPrefix;
}

String paddingLayoutString(long size) {
return STR."MemoryLayout.paddingLayout(\{size})";
String paddingLayoutString(long size, int indent) {
return STR."\{indentString(indent)}MemoryLayout.paddingLayout(\{size})";
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/openjdk/jextract/impl/StructBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -311,7 +311,7 @@ private String structOrUnionLayoutString(long base, Declaration.Scoped scoped, i
long nextOffset = recordMemberOffset(member);
long delta = nextOffset - offset;
if (delta > 0) {
memberLayouts.add(paddingLayoutString(delta / 8));
memberLayouts.add(paddingLayoutString(delta / 8, indent + 1));
offset += delta;
if (isStruct) {
size += delta;
@@ -341,7 +341,7 @@ private String structOrUnionLayoutString(long base, Declaration.Scoped scoped, i
long trailPadding = isStruct ?
(expectedSize - size) / 8 :
expectedSize / 8;
memberLayouts.add(paddingLayoutString(trailPadding));
memberLayouts.add(paddingLayoutString(trailPadding, indent + 1));
}

String prefix = isStruct ?