Allow records with system header fields to implement ByteRepr

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -207,10 +207,6 @@ bool TypeImplementsByteRepr(clang::QualType qt) {
     return TypeImplementsByteRepr(arr->getElementType());
   }
   if (const auto *rd = qt->getAsRecordDecl()) {
-    if (rd->getASTContext().getSourceManager().isInSystemHeader(
-            rd->getLocation())) {
-      return false;
-    }
     if (rd->isUnion()) {
       return true;
     }

tests/unit/out/refcount/array_of_noncopy_struct.rs

@@ -6,21 +6,36 @@ use std::io::prelude::*;
 use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
+#[repr(C)]
 #[derive(Default)]
 pub struct NonCopy {
-    pub data: Value<Vec<i32>>,
-    pub tag: Value<i32>,
+    pub data: Vec<i32>,
+    pub tag: i32,
 }
 impl Clone for NonCopy {
     fn clone(&self) -> Self {
         let mut this = Self {
-            data: Rc::new(RefCell::new((*self.data.borrow()).clone())),
-            tag: Rc::new(RefCell::new((*self.tag.borrow()))),
+            data: (self.data).clone(),
+            tag: self.tag,
         };
         this
     }
 }
-impl ByteRepr for NonCopy {}
+impl ByteRepr for NonCopy {
+    fn byte_size() -> usize {
+        32
+    }
+    fn to_bytes(&self, buf: &mut [u8]) {
+        self.data.to_bytes(&mut buf[0..24]);
+        self.tag.to_bytes(&mut buf[24..28]);
+    }
+    fn from_bytes(buf: &[u8]) -> Self {
+        Self {
+            data: <Vec<i32>>::from_bytes(&buf[0..24]),
+            tag: <i32>::from_bytes(&buf[24..28]),
+        }
+    }
+}
 pub fn main() {
     std::process::exit(main_0());
 }
@@ -30,17 +45,21 @@ fn main_0() -> i32 {
             .map(|_| <NonCopy>::default())
             .collect::<Box<[NonCopy]>>(),
     ));
-    (*(*arr.borrow())[(0) as usize].tag.borrow_mut()) = 7;
-    (*(*arr.borrow())[(1) as usize].data.borrow_mut()).push(42);
-    assert!(((*(*arr.borrow())[(0) as usize].tag.borrow()) == 7));
-    assert!(((*(*arr.borrow())[(1) as usize].data.borrow()).len() == 1_usize));
+    (*arr.borrow_mut())[(0) as usize].tag = 7;
+    (*arr.borrow_mut())[(1) as usize].data.push(42);
+    assert!(((*arr.borrow())[(0) as usize].tag == 7));
+    assert!(((*arr.borrow())[(1) as usize].data.len() == 1_usize));
     assert!(
-        ((((*arr.borrow())[(1) as usize].data.as_pointer() as Ptr<i32>)
+        ((((arr.as_pointer() as Ptr<NonCopy>).offset(1).field_ptr(
+            0,
+            |__v: &NonCopy| &__v.data[..],
+            |__v: &mut NonCopy| &mut __v.data[..]
+        ) as Ptr<i32>)
             .offset(0_usize)
             .read())
             == 42)
     );
-    assert!(((*(*arr.borrow())[(2) as usize].tag.borrow()) == 0));
-    assert!(((*(*arr.borrow())[(2) as usize].data.borrow()).len() == 0_usize));
+    assert!(((*arr.borrow())[(2) as usize].tag == 0));
+    assert!(((*arr.borrow())[(2) as usize].data.len() == 0_usize));
     return 0;
 }