VaList -> Ptr<VaArg>

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -116,7 +116,7 @@ bool Converter::VisitRecoveryExpr(clang::RecoveryExpr *expr) {
 bool Converter::Convert(clang::QualType qual_type) {
   // Catch va_list before desugaring
   if (IsVaListType(qual_type)) {
-    StrCat("VaList");
+    StrCat("*const VaArg");
     return false;
   }
 
@@ -307,7 +307,7 @@ bool Converter::VisitPointerType(clang::PointerType *type) {
   }
 
   if (IsVaListType(clang::QualType(type, 0))) {
-    StrCat("VaList");
+    StrCat("*const VaArg");
     return false;
   }
 
@@ -472,7 +472,8 @@ void Converter::ConvertVaListVarDecl(clang::VarDecl *decl) {
     // va_list local variable
     StrCat(keyword::kLet);
   }
-  StrCat(keyword_mut_, GetNamedDeclAsString(decl), token::kColon, "VaList");
+  StrCat(keyword_mut_, GetNamedDeclAsString(decl), token::kColon,
+         "*const VaArg");
 }
 
 bool Converter::NeedsMut(const clang::VarDecl *decl, clang::QualType type,
@@ -1864,7 +1865,7 @@ void Converter::ConvertVariadicArg(clang::Expr *arg) {
 void Converter::ConvertVAArgCall(clang::CallExpr *expr) {
   if (IsBuiltinVaStart(expr)) {
     StrCat(ToString(expr->getArg(0)->IgnoreImpCasts()),
-           "= VaList::new(__args)");
+           "= __args.as_ptr()");
     return;
   }
   if (IsBuiltinVaEnd(expr)) {
@@ -4244,7 +4245,7 @@ std::string Converter::GetDefaultAsString(clang::QualType qual_type) {
 
   if (IsVaListType(qual_type)) {
     computed_expr_type_ = ComputedExprType::FreshValue;
-    return "VaList::default()";
+    return "::std::ptr::null()";
   }
 
   if (auto arr = GetArrayDefaultAsString(qual_type); !arr.empty()) {

cpp2rust/converter/models/converter_refcount.cpp

@@ -259,7 +259,7 @@ std::string ConverterRefCount::BoxValue(std::string &&str) const {
 bool ConverterRefCount::Convert(clang::QualType qual_type) {
   // Catch va_list before desugaring
   if (IsVaListType(qual_type)) {
-    StrCat(BoxType("VaList"));
+    StrCat(BoxType("Ptr<VaArg>"));
     return false;
   }
 
@@ -325,7 +325,7 @@ bool ConverterRefCount::VisitPointerType(clang::PointerType *type) {
   }
 
   if (IsVaListType(clang::QualType(type, 0))) {
-    StrCat("VaList");
+    StrCat("Ptr<VaArg>");
     return false;
   }
 
@@ -792,6 +792,10 @@ void ConverterRefCount::EmitFunctionPreamble(clang::FunctionDecl *decl) {
   // name_2)'. We want to get the parameters from the definition if possible,
   // i.e. name_2.
   PushConversionKind push(*this, ConversionKind::FullRefCount);
+  if (decl->isVariadic()) {
+    StrCat("let __args: Value<Box<[VaArg]>> = "
+           "Rc::new(RefCell::new(__args.into()));");
+  }
   auto params = decl->getDefinition() ? decl->getDefinition()->parameters()
                                       : decl->parameters();
   for (auto *param : params) {
@@ -854,7 +858,7 @@ void ConverterRefCount::ConvertVaListVarDecl(clang::VarDecl *decl) {
     StrCat(keyword::kLet);
   }
 
-  StrCat(GetNamedDeclAsString(decl), token::kColon, "Value<VaList>");
+  StrCat(GetNamedDeclAsString(decl), token::kColon, "Value<Ptr<VaArg>>");
 }
 
 bool ConverterRefCount::ConvertVarDeclSkipInit(clang::VarDecl *decl) {
@@ -1283,7 +1287,12 @@ void ConverterRefCount::ConvertPrintf(clang::CallExpr *expr) {
 }
 
 bool ConverterRefCount::VisitCallExpr(clang::CallExpr *expr) {
-  if (IsBuiltinVaStart(expr) || IsBuiltinVaEnd(expr) || IsBuiltinVaCopy(expr)) {
+  if (IsBuiltinVaStart(expr)) {
+    StrCat(ToString(expr->getArg(0)->IgnoreImpCasts()),
+           "= __args.as_pointer()");
+    return false;
+  }
+  if (IsBuiltinVaEnd(expr) || IsBuiltinVaCopy(expr)) {
     ConvertVAArgCall(expr);
     return false;
   }
@@ -2526,7 +2535,7 @@ std::string ConverterRefCount::GetDefaultAsString(clang::QualType qual_type) {
 
   if (IsVaListType(qual_type)) {
     computed_expr_type_ = ComputedExprType::FreshValue;
-    return BoxValue("VaList::default()");
+    return BoxValue("Ptr::<VaArg>::default()");
   }
 
   if (auto arr = GetArrayDefaultAsString(qual_type); !arr.empty()) {

libcc2rs/src/va_args.rs

@@ -5,6 +5,8 @@ use std::any::Any;
 use std::ffi::c_void;
 use std::rc::Rc;
 
+use crate::inc::PrefixInc;
+use crate::rc::Ptr;
 use crate::void::AnyPtr;
 
 #[derive(Clone)]
@@ -52,27 +54,28 @@ impl<T: crate::reinterpret::ByteRepr + 'static> From<crate::rc::Ptr<T>> for VaAr
     }
 }
 
-#[derive(Clone, Default)]
-pub struct VaList {
-    args: Rc<[VaArg]>,
-    pos: usize,
+impl crate::reinterpret::ByteRepr for VaArg {}
+
+impl Ptr<VaArg> {
+    pub fn arg<T: VaArgGet>(&mut self) -> T {
+        let val = self.with(T::get);
+        self.prefix_inc();
+        val
+    }
 }
 
-impl crate::reinterpret::ByteRepr for VaList {}
+pub trait VaArgs {
+    unsafe fn arg<T: VaArgGet>(&mut self) -> T;
+}
 
-impl VaList {
-    pub fn new(args: &[VaArg]) -> Self {
-        VaList {
-            args: Rc::from(args),
-            pos: 0,
+impl VaArgs for *const VaArg {
+    unsafe fn arg<T: VaArgGet>(&mut self) -> T {
+        unsafe {
+            let val = T::get(&**self);
+            *self = self.add(1);
+            val
         }
     }
-
-    pub fn arg<T: VaArgGet>(&mut self) -> T {
-        let val = &self.args[self.pos];
-        self.pos += 1;
-        T::get(val)
-    }
 }
 
 pub trait VaArgGet {