Re-order members of EmberAfAttributeMetadata to improve packing. (#24336

)

Fixes #23720

Co-authored-by: Timothy Maes <[email protected]>

.github/workflows/zap_regeneration.yaml

@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.30
+            image: connectedhomeip/chip-build:0.6.31
         defaults:
             run:
                 shell: sh

.github/workflows/zap_templates.yaml

@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.30
+            image: connectedhomeip/chip-build:0.6.31
         defaults:
             run:
                 shell: sh

integrations/docker/images/chip-cert-bins/Dockerfile

@@ -7,7 +7,7 @@ ARG COMMITHASH=451e602649b8b37ba6c9aab8ba5e30747293f778
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.01.06-nightly
+ARG ZAP_VERSION=v2023.01.09-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

src/app/util/attribute-metadata.h

@@ -132,27 +132,31 @@ union EmberAfDefaultOrMinMaxAttributeValue
 struct EmberAfAttributeMetadata
 {
     /**
-     * Attribute ID, according to ZCL specs.
+     * Pointer to the default value union. Actual value stored
+     * depends on the mask.
      */
-    chip::AttributeId attributeId;
+    EmberAfDefaultOrMinMaxAttributeValue defaultValue;
+
     /**
-     * Attribute type, according to ZCL specs.
+     * Attribute ID, according to ZCL specs.
      */
-    EmberAfAttributeType attributeType;
+    chip::AttributeId attributeId;
+
     /**
      * Size of this attribute in bytes.
      */
     uint16_t size;
+
+    /**
+     * Attribute type, according to ZCL specs.
+     */
+    EmberAfAttributeType attributeType;
+
     /**
      * Attribute mask, tagging attribute with specific
      * functionality.
      */
     EmberAfAttributeMask mask;
-    /**
-     * Pointer to the default value union. Actual value stored
-     * depends on the mask.
-     */
-    EmberAfDefaultOrMinMaxAttributeValue defaultValue;
 
     /**
      * Check whether this attribute is nullable.

src/app/util/attribute-storage.h

@@ -66,13 +66,13 @@
 
 #define DECLARE_DYNAMIC_ATTRIBUTE_LIST_END()                                                                                       \
     {                                                                                                                              \
-        0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT()                                     \
+        ZAP_EMPTY_DEFAULT(), 0xFFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE)                                     \
     } /* cluster revision */                                                                                                       \
     }
 
 #define DECLARE_DYNAMIC_ATTRIBUTE(attId, attType, attSizeBytes, attrMask)                                                          \
     {                                                                                                                              \
-        attId, ZAP_TYPE(attType), attSizeBytes, attrMask | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT()               \
+        ZAP_EMPTY_DEFAULT(), attId, attSizeBytes, ZAP_TYPE(attType), attrMask | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE)               \
     }
 
 #define CLUSTER_TICK_FREQ_ALL (0x00)