rust-lang · emilio · Jul 25, 2022
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
@@ -2025,7 +2025,9 @@ impl CodeGenerator for CompInfo {
             attributes.push(attributes::repr("C"));
         }
 
-        if ctx.options().rust_features().repr_align {
+        if ctx.options().rust_features().repr_align && !packed {
+            // We can't specify both packed(N) and align(N), but the align()
+            // should be redundant in this case.
             if let Some(explicit) = explicit_align {
                 // Ensure that the struct has the correct alignment even in
                 // presence of alignas.

diff --git a/tests/expectations/struct_with_anon_struct_array_float.rs b/tests/expectations/struct_with_anon_struct_array_float.rs
diff --git a/tests/expectations/tests/packed-align-conflict.rs b/tests/expectations/tests/packed-align-conflict.rs
diff --git a/tests/headers/packed-align-conflict.h b/tests/headers/packed-align-conflict.h
@@ -0,0 +1,3 @@
+struct FndrOpaqueInfo {
+  char opaque[16];
+} __attribute__((aligned(2), packed));