commit e6e5f30f4f39e5e258370d428f75890cdbbb584c
author Googler <no-reply@google.com> Fri Sep 17 13:56:40 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 21:53:23 2022 +0000
tree f9a523bd4cda22969f0b0fa99130c512b0fbf49b
parent 6986c079d0af3b50569494b4e12818577cfc7a1d

Serialize and deserialize size/alignment/offset.

These values aren't being used in code generation yet; this will come in a
followup CL.

PiperOrigin-RevId: 397309754

rs_bindings_from_cc/ir.rs

diff --git a/rs_bindings_from_cc/ir.rs b/rs_bindings_from_cc/ir.rs
index fdd8328..3ec3cad 100644
--- a/rs_bindings_from_cc/ir.rs
+++ b/rs_bindings_from_cc/ir.rs
@@ -59,12 +59,15 @@
     #[serde(rename(deserialize = "type"))]
     pub type_: IRType,
     pub access: AccessSpecifier,
+    pub offset: i64,
 }
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize)]
 pub struct Record {
     pub identifier: Identifier,
     pub fields: Vec<Field>,
+    pub size: i64,
+    pub alignment: i64,
 }
 
 #[derive(Debug, Default, PartialEq, Eq, Hash, Clone, Deserialize)]
@@ -154,19 +157,24 @@
                         {
                             "identifier": {"identifier": "public_int" },
                             "type": {"rs_name": "i32", "cc_name": "int", "cc_const": false, "type_params": [] },
-                            "access": "Public"
+                            "access": "Public",
+                            "offset": 0
                         },
                         {
                             "identifier": {"identifier": "protected_int" },
                             "type": {"rs_name": "i32", "cc_name": "int", "cc_const": false, "type_params": [] },
-                            "access": "Protected"
+                            "access": "Protected",
+                            "offset": 32
                         },
                         {
                             "identifier": {"identifier": "private_int" },
                             "type": {"rs_name": "i32", "cc_name": "int", "cc_const": false, "type_params": [] },
-                            "access": "Private"
+                            "access": "Private",
+                            "offset": 64
                         }
-                    ]
+                    ],
+                    "size": 12,
+                    "alignment": 4
                 }
             ]
         }
@@ -185,6 +193,7 @@
                             type_params: vec![],
                         },
                         access: AccessSpecifier::Public,
+                        offset: 0,
                     },
                     Field {
                         identifier: Identifier { identifier: "protected_int".to_string() },
@@ -195,6 +204,7 @@
                             type_params: vec![],
                         },
                         access: AccessSpecifier::Protected,
+                        offset: 32,
                     },
                     Field {
                         identifier: Identifier { identifier: "private_int".to_string() },
@@ -205,8 +215,11 @@
                             type_params: vec![],
                         },
                         access: AccessSpecifier::Private,
+                        offset: 64,
                     },
                 ],
+                size: 12,
+                alignment: 4,
             }],
             ..Default::default()
         };
@@ -226,9 +239,12 @@
                             "type": {"rs_name": "*mut", "cc_name": "*", "cc_const": false, "type_params": [
                                 {"rs_name": "SomeStruct", "cc_name": "SomeStruct", "cc_const": false, "type_params": []}
                             ] },
-                            "access": "Public"
+                            "access": "Public",
+                            "offset": 0
                         }
-                    ]
+                    ],
+                    "size": 8,
+                    "alignment": 8
                 }
             ]
         }
@@ -251,7 +267,10 @@
                         }],
                     },
                     access: AccessSpecifier::Public,
+                    offset: 0,
                 }],
+                size: 8,
+                alignment: 8,
             }],
             ..Default::default()
         };