Merge pull request #1484 from iovisor/yhs_dev

add padding to the end of structure

src/cc/json_map_decl_visitor.cc

@@ -145,6 +145,13 @@ bool BMapDeclVisitor::VisitRecordDecl(RecordDecl *D) {
       Offset = FieldOffset + FieldSize;
       genJSONForField(F);
     }
+
+    /* Additional Padding after the last field so that the Record Size matches */
+    CharUnits RecordSize = Layout.getSize();
+    if (RecordSize > Offset) {
+        result_ += "[\"__pad_end\",\"char\",["
+                + to_string((RecordSize - Offset).getQuantity()) + "]], ";
+    }
   }
 
   if (!D->getDefinition()->field_empty())

tests/python/test_clang.py

@@ -685,6 +685,7 @@ struct key_t {
   };
   u8 f1_3;                /* offset 48 */
   unsigned __int128 f1_4; /* offset 64 */
+  char f1_5;              /* offset 80 */
 };
 struct value_t {
   u8 src[4] __attribute__ ((aligned (8))); /* offset 0 */
@@ -694,8 +695,8 @@ BPF_HASH(table1, struct key_t, struct value_t);
 """
         b = BPF(text=text)
         table = b['table1']
-        self.assertEqual(ct.sizeof(table.Key), 80)
-        self.assertEqual(ct.sizeof(table.Leaf), 12)
+        self.assertEqual(ct.sizeof(table.Key), 96)
+        self.assertEqual(ct.sizeof(table.Leaf), 16)
 
 
 if __name__ == "__main__":