Add fields for OffsetOf

Author: aibaars

rust/.generated.list

@@ -814,6 +814,8 @@ impl TrapEntry for Module {
 pub struct OffsetOf {
     pub id: TrapId,
     pub location: Option<trap::Label>,
+    pub container: trap::Label,
+    pub fields: Vec<String>,
 }
 
 impl TrapEntry for OffsetOf {
@@ -822,10 +824,13 @@ impl TrapEntry for OffsetOf {
     }
 
     fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("offset_ofs", vec![trap::Arg::Label(id)]);
+        out.add_tuple("offset_ofs", vec![trap::Arg::Label(id), self.container.into()]);
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
+        for (i, &v) in self.fields.iter().enumerate() {
+            out.add_tuple("offset_of_fields", vec![trap::Arg::Label(id), i.into(), v.into()]);
+        }
     }
 }
 

rust/extractor/src/generated/top.rs

@@ -456,7 +456,15 @@ module_declarations(
 );
 
 offset_ofs(
-  unique int id: @offset_of
+  unique int id: @offset_of,
+  int container: @type_ref ref
+);
+
+#keyset[id, index]
+offset_of_fields(
+  int id: @offset_of ref,
+  int index: int ref,
+  string field: string ref
 );
 
 or_pats(

rust/ql/lib/codeql/rust/generated/OffsetOf.qll

@@ -437,7 +437,9 @@ class Underscore(Expr):
 
 
 class OffsetOf(Expr):
-    pass
+    container: TypeRef
+    fields: list[string]
+
 #     InlineAsm(InlineAsm),