Merge branch 'master' into void-round-trip

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -204,6 +204,9 @@ bool TypeImplementsByteRepr(clang::QualType qt) {
   if (qt->isIntegerType() || qt->isFloatingType() || qt->isEnumeralType()) {
     return true;
   }
+  if (qt->isPointerType()) {
+    return true;
+  }
   if (const auto *arr = qt->getAsArrayTypeUnsafe()) {
     return TypeImplementsByteRepr(arr->getElementType());
   }

cpp2rust/converter/models/converter_refcount.cpp

@@ -503,10 +503,13 @@ void ConverterRefCount::EmitRustUnion(clang::RecordDecl *decl) {
   {
     PushBrace impl_brace(*this);
     for (auto *field : decl->fields()) {
+      PushConversionKind push(*this, ConversionKind::FullRefCount);
+      std::string storage_ty = ToString(field->getType());
+      Unwrap(storage_ty, "Value<", ">");
       StrCat(std::format(
           "pub fn {}(&self) -> Ptr<{}> {{ (self.__bytes.as_pointer() "
           "as Ptr<u8>).reinterpret_cast() }}",
-          GetNamedDeclAsString(field), Mapper::Map(field->getType())));
+          GetNamedDeclAsString(field), storage_ty));
     }
   }
 
@@ -1310,9 +1313,9 @@ bool ConverterRefCount::VisitExplicitCastExpr(clang::ExplicitCastExpr *expr) {
     } else if (expr->getSubExpr()->getType()->isPointerType() &&
                !expr->getSubExpr()->isNullPointerConstant(
                    ctx_, clang::Expr::NPC_ValueDependentIsNull)) {
-      StrCat(std::format("({}.to_strong().as_pointer() as {})",
+      StrCat(std::format("{}.reinterpret_cast::<{}>()",
                          ToString(expr->getSubExpr()),
-                         ToString(expr->getType())));
+                         ConvertPointeeType(expr->getType())));
       return false;
     }
     return Converter::VisitExplicitCastExpr(expr);
@@ -1499,6 +1502,7 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
 }
 
 void ConverterRefCount::ConvertUnionMemberAccessor(clang::MemberExpr *expr) {
+  auto member = expr->getMemberDecl();
   std::string str;
   {
     Buffer buf(*this);
@@ -1509,15 +1513,24 @@ void ConverterRefCount::ConvertUnionMemberAccessor(clang::MemberExpr *expr) {
   str += "()";
 
   if (isAddrOf()) {
-    StrCat(str);
+    if (member->getType()->isArrayType()) {
+      PushConversionKind push(*this, ConversionKind::Unboxed);
+      StrCat(std::format(
+          "{}.reinterpret_cast::<{}>()", str,
+          ToString(
+              member->getType()->getAsArrayTypeUnsafe()->getElementType())));
+    } else {
+      StrCat(str);
+    }
     computed_expr_type_ = ComputedExprType::Pointer;
     return;
   }
+
   if (isLValue()) {
     pending_deref_.set(str);
     return;
   }
-  StrCat(DerefPtrExpr(str, expr->getMemberDecl()->getType()));
+  StrCat(DerefPtrExpr(str, member->getType()));
 }
 
 bool ConverterRefCount::VisitMemberExpr(clang::MemberExpr *expr) {
@@ -2071,7 +2084,7 @@ bool ConverterRefCount::ConvertCXXOperatorCallExpr(
       StrCat(
           std::format("{}.as_ref().unwrap()", ConvertRValue(expr->getArg(0))));
       if (isAddrOf()) {
-        StrCat(std::format(".as_pointer().offset(({}) as isize)",
+        StrCat(std::format(".as_pointer().offset(({}))",
                            ConvertRValue(expr->getArg(1))));
       } else {
         if (isRValue()) {
@@ -2091,7 +2104,7 @@ bool ConverterRefCount::ConvertCXXOperatorCallExpr(
 
     if (isLValue()) {
       PushConversionKind push_ck(*this, ConversionKind::Unboxed);
-      pending_deref_.set(std::format("({} as {}).offset({} as isize)",
+      pending_deref_.set(std::format("({} as {}).offset({})",
                                      ConvertObject(expr->getArg(0)),
                                      ConvertPtrType(expr->getArg(0)->getType()),
                                      ConvertRValue(expr->getArg(1))),
@@ -2111,7 +2124,7 @@ bool ConverterRefCount::ConvertCXXOperatorCallExpr(
       }
 
       PushConversionKind push(*this, ConversionKind::Unboxed);
-      StrCat(std::format("({} as {}).offset({} as isize)",
+      StrCat(std::format("({} as {}).offset({})",
                          ConvertObject(expr->getArg(0)),
                          ConvertPtrType(expr->getArg(0)->getType()),
                          ConvertRValue(expr->getArg(1))));
@@ -2162,7 +2175,7 @@ void ConverterRefCount::ConvertArraySubscript(clang::Expr *base,
 
     {
       PushParen paren(*this, is_inner_boxed);
-      StrCat(std::format("({} as {}).offset({} as isize)",
+      StrCat(std::format("({} as {}).offset({})",
                          ToString(base->IgnoreImplicit()),
                          ConvertPtrType(base->IgnoreImplicit()->getType()),
                          ConvertRValue(idx)));

libcc2rs/src/rc.rs

@@ -296,7 +296,11 @@ impl<T> Ptr<T> {
     }
 
     #[inline]
-    pub fn offset(&self, offset: isize) -> Self {
+    pub fn offset(&self, offset: impl TryInto<isize>) -> Self {
+        let offset = offset
+            .try_into()
+            .ok()
+            .expect("the offset must fit in a isize");
         let step = self.elem_step();
         Self {
             kind: self.kind.clone(),
@@ -1205,6 +1209,7 @@ impl<T: ?Sized> AsPointerDyn<T> for Rc<RefCell<T>> {
 }
 
 impl<T: 'static> ByteRepr for Ptr<T> {}
+impl ByteRepr for AnyPtr {}
 
 #[cfg(test)]
 mod tests {

tests/lit/lit/formats/Cpp2RustTest.py

@@ -18,6 +18,7 @@
 PTR_RE = re.compile(r"0x[0-9a-fA-F]+")
 
 RE_XFAIL = re.compile(r"//\s*XFAIL:\s*(.*)")
+RE_PANIC_UB = re.compile(r"//\s*panic-ub\s*(?::\s*(.*))?$", re.MULTILINE)
 RE_PANIC = re.compile(r"//\s*panic\s*(?::\s*(.*))?$", re.MULTILINE)
 RE_NOCOMPILE = re.compile(r"//\s*no-compile\s*(?::\s*(.*))?$", re.MULTILINE)
 RE_TRANS_FAIL = re.compile(r"//\s*translation-fail\s*(?::\s*(.*))?$", re.MULTILINE)
@@ -27,6 +28,7 @@
 @dataclass
 class TestExpectations:
     should_panic: bool = False
+    should_panic_ub: bool = False
     should_not_compile: bool = False
     should_not_translate: bool = False
     is_nondet_result: bool = False
@@ -47,6 +49,7 @@ def matches(match):
         xfail = xfail_m is not None and model in re.split(r"\s*,\s*", xfail_m.group(1))
         return cls(
             should_panic=matches(RE_PANIC.search(text)),
+            should_panic_ub=matches(RE_PANIC_UB.search(text)),
             should_not_compile=matches(RE_NOCOMPILE.search(text)),
             should_not_translate=matches(RE_TRANS_FAIL.search(text)),
             is_nondet_result=matches(RE_NONDET.search(text)),
@@ -254,14 +257,22 @@ def run_rust(self):
             return None
         self.rust_result = RunResult(*lit.util.executeCommand(str(self.rust_bin)))
 
-        if exp.should_panic:
+        if exp.should_panic_ub:
             err = str(self.rust_result.stderr)
             if not re.search(
                 r"thread 'main' \(\d+\) panicked at", err
             ) or self.rust_result.returncode not in [-6, 101]:
                 return (exp.fail_code, "expected panic\n" + err)
             return self.success_result()
 
+        if exp.should_panic:
+            err = str(self.rust_result.stderr)
+            if not re.search(
+                r"thread 'main' \(\d+\) panicked at", err
+            ) or self.rust_result.returncode not in [-6, 101]:
+                return (exp.fail_code, "expected panic\n" + err)
+            return (lit.Test.XFAIL, "")
+
         if exp.is_nondet_result:
             return self.success_result()
         return None

tests/multi-file/opaque_forward_decl/out/refcount/opaque_forward_decl.rs

@@ -11,7 +11,21 @@ pub struct container {
     pub p: Value<Ptr<opaque>>,
     pub x: Value<i32>,
 }
-impl ByteRepr for container {}
+impl ByteRepr for container {
+    fn byte_size() -> usize {
+        16
+    }
+    fn to_bytes(&self, buf: &mut [u8]) {
+        (*self.p.borrow()).to_bytes(&mut buf[0..8]);
+        (*self.x.borrow()).to_bytes(&mut buf[8..12]);
+    }
+    fn from_bytes(buf: &[u8]) -> Self {
+        Self {
+            p: Rc::new(RefCell::new(<Ptr<opaque>>::from_bytes(&buf[0..8]))),
+            x: Rc::new(RefCell::new(<i32>::from_bytes(&buf[8..12]))),
+        }
+    }
+}
 pub fn main() {
     std::process::exit(main_0());
 }

tests/ub/dangling-prvalue-as-lvalue.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
-// panic: refcount
+// panic-ub: refcount
 
 #include <vector>
 

tests/ub/enum_out_of_range_cast.cpp

@@ -1,4 +1,4 @@
-// panic
+// panic-ub
 
 enum Color { RED, GREEN, BLUE };
 

tests/ub/enum_out_of_range_increment.c

@@ -1,4 +1,4 @@
-// panic
+// panic-ub
 
 enum color { RED, GREEN, BLUE };
 

tests/ub/max.cpp

@@ -2,7 +2,7 @@
 // Distributed under the MIT license that can be found in the LICENSE file.
 
 // ub: unsafe
-// panic: refcount
+// panic-ub: refcount
 
 #include <algorithm>
 

tests/ub/out/refcount/ub7.rs

@@ -26,5 +26,5 @@ fn main_0() -> i32 {
         ('n' as u8),
         ('g' as u8),
     ])));
-    return (({ strlen_0(((s.as_pointer() as Ptr<u8>).offset(0 as isize))) }) as i32);
+    return (({ strlen_0(((s.as_pointer() as Ptr<u8>).offset(0))) }) as i32);
 }