Merge branch 'master' into ast-matcher

Author: lucic71

tests/unit/lambda_to_fn_ptr.cpp

@@ -1,5 +1,4 @@
 // ADDITIONAL_COMPILE_FLAGS: -std=c++23
-// no-compile
 #include <assert.h>
 #include <stdarg.h>
 

tests/unit/out/refcount/lambda_to_fn_ptr.rs

@@ -71,25 +71,26 @@ fn main_0() -> i32 {
     assert!((({ call_nttp_1(5,) }) == 4));
     assert!((({ call_nttp_2(5,) }) == 50));
     assert!((({ call_nttp_3(5,) }) == 105));
-    let sum: Value<FnPtr<fn(i32) -> i32>> = Rc::new(RefCell::new(FnPtr::<fn(i32) -> i32>::new(
-        |n: i32| -> i32 {
-            {
-                let __args: Value<Box<[VaArg]>> = Rc::new(RefCell::new(__args.into()));
-                let n: Value<i32> = Rc::new(RefCell::new(n));
-                let ap: Value<Ptr<VaArg>> = Rc::new(RefCell::new(Ptr::<VaArg>::default()));
-                (*ap.borrow_mut()) = __args.as_pointer();
-                let s: Value<i32> = Rc::new(RefCell::new(0));
-                let mut i: i32 = 0;
-                'loop_: while (i < (*n.borrow())) {
-                    (*s.borrow_mut()) += (*ap.borrow_mut()).arg::<i32>();
-                    i.postfix_inc();
+    let sum: Value<FnPtr<fn(i32, Box<[VaArg]>) -> i32>> =
+        Rc::new(RefCell::new(FnPtr::<fn(i32, Box<[VaArg]>) -> i32>::new(
+            |n: i32, __args: Box<[VaArg]>| -> i32 {
+                {
+                    let __args: Value<Box<[VaArg]>> = Rc::new(RefCell::new(__args.into()));
+                    let n: Value<i32> = Rc::new(RefCell::new(n));
+                    let ap: Value<Ptr<VaArg>> = Rc::new(RefCell::new(Ptr::<VaArg>::default()));
+                    (*ap.borrow_mut()) = __args.as_pointer();
+                    let s: Value<i32> = Rc::new(RefCell::new(0));
+                    let mut i: i32 = 0;
+                    'loop_: while (i < (*n.borrow())) {
+                        (*s.borrow_mut()) += (*ap.borrow_mut()).arg::<i32>();
+                        i.postfix_inc();
+                    }
+                    return (*s.borrow());
                 }
-                return (*s.borrow());
-            }
-        },
-    )));
-    assert!((({ (*sum.borrow()).call(2, &[(5).into(), (5).into(),]) }) == 10));
-    assert!((({ (*sum.borrow()).call(3, &[(1).into(), (2).into(), (3).into(),]) }) == 6));
+            },
+        )));
+    assert!((({ (*sum.borrow()).call(2, Box::new([(5).into(), (5).into(),])) }) == 10));
+    assert!((({ (*sum.borrow()).call(3, Box::new([(1).into(), (2).into(), (3).into(),])) }) == 6));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/lambda_to_fn_ptr.rs

@@ -86,21 +86,22 @@ unsafe fn main_0() -> i32 {
     assert!(((unsafe { call_nttp_1(5,) }) == (4)));
     assert!(((unsafe { call_nttp_2(5,) }) == (50)));
     assert!(((unsafe { call_nttp_3(5,) }) == (105)));
-    let mut sum: FnPtr<fn(i32) -> i32> = FnPtr::<fn(i32) -> i32>::new(|mut n: i32| -> i32 {
-        unsafe {
-            let mut ap: *const VaArg = ::std::ptr::null();
-            ap = __args.as_ptr();
-            let mut s: i32 = 0;
-            let mut i: i32 = 0;
-            'loop_: while ((i) < (n)) {
-                s += ap.arg::<i32>();
-                i.postfix_inc();
+    let mut sum: FnPtr<fn(i32, Box<[VaArg]>) -> i32> =
+        FnPtr::<fn(i32, Box<[VaArg]>) -> i32>::new(|mut n: i32, __args: Box<[VaArg]>| -> i32 {
+            unsafe {
+                let mut ap: *const VaArg = ::std::ptr::null();
+                ap = __args.as_ptr();
+                let mut s: i32 = 0;
+                let mut i: i32 = 0;
+                'loop_: while ((i) < (n)) {
+                    s += ap.arg::<i32>();
+                    i.postfix_inc();
+                }
+                return s;
             }
-            return s;
-        }
-    });
-    assert!(((unsafe { sum.call(2, &[(5).into(), (5).into(),]) }) == (10)));
-    assert!(((unsafe { sum.call(3, &[(1).into(), (2).into(), (3).into(),]) }) == (6)));
+        });
+    assert!(((unsafe { sum.call(2, Box::new([(5).into(), (5).into(),])) }) == (10)));
+    assert!(((unsafe { sum.call(3, Box::new([(1).into(), (2).into(), (3).into(),])) }) == (6)));
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}