Skip to content

Commit abc629a

Browse files
Merge branch 'dotnet:main' into with-packing-tests
2 parents e162c16 + 69391f1 commit abc629a

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -2822,11 +2822,6 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
28222822
AddDiagnostic(DiagnosticLevel.Info, $"{escapedName} (constant array field) has a size of 0", constantOrIncompleteArray);
28232823
}
28242824

2825-
if (!TryGetRemappedValue(recordDecl, _config.WithPackings, out var pack))
2826-
{
2827-
pack = alignment < maxAlignm ? alignment.ToString(CultureInfo.InvariantCulture) : null;
2828-
}
2829-
28302825
var desc = new StructDesc {
28312826
AccessSpecifier = accessSpecifier,
28322827
EscapedName = escapedName,
@@ -2836,7 +2831,7 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
28362831
Alignment64 = alignment64,
28372832
Size32 = size32,
28382833
Size64 = size64,
2839-
Pack = pack,
2834+
Pack = alignment < maxAlignm ? alignment.ToString(CultureInfo.InvariantCulture) : null,
28402835
MaxFieldAlignment = maxAlignm,
28412836
Kind = LayoutKind.Sequential
28422837
},

0 commit comments

Comments
 (0)