Unbox initializer list in refcount

Author: lucic71

cpp2rust/converter/models/converter_refcount.cpp

@@ -1673,6 +1673,12 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
   return false;
 }
 
+bool ConverterRefCount::VisitCXXStdInitializerListExpr(
+    clang::CXXStdInitializerListExpr *expr) {
+  PushConversionKind push(*this, ConversionKind::Unboxed);
+  return Converter::VisitCXXStdInitializerListExpr(expr);
+}
+
 void ConverterRefCount::ConvertUnionMemberAccessor(clang::MemberExpr *expr) {
   auto member = expr->getMemberDecl();
   std::string str;

cpp2rust/converter/models/converter_refcount.h

@@ -127,6 +127,10 @@ class ConverterRefCount final : public Converter {
   void EmitStmtExprTail(clang::Expr *tail) override;
 
   bool VisitInitListExpr(clang::InitListExpr *expr) override;
+
+  bool VisitCXXStdInitializerListExpr(
+      clang::CXXStdInitializerListExpr *expr) override;
+
   bool VisitArrayInitLoopExpr(clang::ArrayInitLoopExpr *expr) override;
 
   bool VisitArraySubscriptExpr(clang::ArraySubscriptExpr *expr) override;

tests/unit/initializer_list.cpp

@@ -12,5 +12,10 @@ size_t f(std::initializer_list<int> bytes) {
 
 int main() {
   assert(f({1, 2, 3}) == 3);
+  std::vector<int> v = {4, 5, 6};
+  assert(v.size() == 3);
+  assert(v[0] + v[1] + v[2] == 15);
+  std::initializer_list<int> l = {7, 8};
+  assert(l.size() == 2);
   return 0;
 }

tests/unit/out/refcount/initializer_list.rs

@@ -19,6 +19,16 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     assert!((({ f_0(vec![1, 2, 3,],) }) == 3_usize));
+    let v: Value<Vec<i32>> = Rc::new(RefCell::new(vec![4, 5, 6]));
+    assert!(((*v.borrow()).len() == 3_usize));
+    assert!(
+        (((((v.as_pointer() as Ptr<i32>).offset(0_usize).read())
+            + ((v.as_pointer() as Ptr<i32>).offset(1_usize).read()))
+            + ((v.as_pointer() as Ptr<i32>).offset(2_usize).read()))
+            == 15)
+    );
+    let l: Value<Vec<i32>> = Rc::new(RefCell::new(vec![7, 8]));
+    assert!(((*l.borrow()).len() == 2_usize));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/initializer_list.rs

@@ -20,6 +20,11 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     assert!(((unsafe { f_0(vec![1, 2, 3,],) }) == (3_usize)));
+    let mut v: Vec<i32> = vec![4, 5, 6];
+    assert!(((v.len()) == (3_usize)));
+    assert!(((((v[(0_usize)]) + (v[(1_usize)])) + (v[(2_usize)])) == (15)));
+    let mut l: Vec<i32> = vec![7, 8];
+    assert!(((l.len()) == (2_usize)));
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}