Merge branch 'dotnet:main' into with-packing-tests

dotnet · Nov 7, 2022 · abc629a · abc629a
2 parents e162c16 + 69391f1
commit abc629a
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -2822,11 +2822,6 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
                 AddDiagnostic(DiagnosticLevel.Info, $"{escapedName} (constant array field) has a size of 0", constantOrIncompleteArray);
             }
 
-            if (!TryGetRemappedValue(recordDecl, _config.WithPackings, out var pack))
-            {
-                pack = alignment < maxAlignm ? alignment.ToString(CultureInfo.InvariantCulture) : null;
-            }
-
             var desc = new StructDesc {
                 AccessSpecifier = accessSpecifier,
                 EscapedName = escapedName,
@@ -2836,7 +2831,7 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
                     Alignment64 = alignment64,
                     Size32 = size32,
                     Size64 = size64,
-                    Pack = pack,
+                    Pack = alignment < maxAlignm ? alignment.ToString(CultureInfo.InvariantCulture) : null,
                     MaxFieldAlignment = maxAlignm,
                     Kind = LayoutKind.Sequential
                 },