Fix desugared deduced nttp

Author: lucic71

cpp2rust/converter/models/converter_refcount.cpp

@@ -1888,6 +1888,7 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
         PushConversionKind push(*this, ConversionKind::Unboxed);
         ConverterRefCount::VisitInitListExpr(init);
       } else {
+        PushConversionKind push(*this, ConversionKind::Unboxed);
         StrCat(GetDefaultAsString(qual_type));
       }
       computed_expr_type_ = ComputedExprType::FreshValue;

cpp2rust/converter/rules/decls.cpp

@@ -91,6 +91,15 @@ DeduceFromType(clang::Sema &sema, clang::TemplateParameterList *params,
       trial.failed()) {
     return std::nullopt;
   }
+  for (unsigned i = 0; i < deduced.size(); ++i) {
+    auto nttp =
+        llvm::dyn_cast<clang::NonTypeTemplateParmDecl>(params->getParam(i));
+    if (nttp && !nttp->getType()->isDependentType() &&
+        deduced[i].getKind() == clang::TemplateArgument::Integral) {
+      deduced[i] = clang::TemplateArgument(
+          sema.Context, deduced[i].getAsIntegral(), nttp->getType());
+    }
+  }
   return std::vector<clang::TemplateArgument>(deduced.begin(), deduced.end());
 }
 

tests/unit/out/refcount/empty_array_init.rs

@@ -11,9 +11,9 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    let vec_: Value<Vec<i32>> = Rc::new(RefCell::new(Rc::new(RefCell::new(
-        std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec(),
-    ))));
+    let vec_: Value<Vec<i32>> = Rc::new(RefCell::new(
+        std::array::from_fn::<_, 3_usize, _>(|_| <i32>::default()).to_vec(),
+    ));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/inline_container_fields.rs

@@ -55,7 +55,7 @@ impl Default for State {
                 grid: (0..2)
                     .map(|_| (0..3).map(|_| 0_i32).collect::<Box<[i32]>>())
                     .collect::<Box<[Box<[i32]>]>>(),
-                arr: std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec(),
+                arr: std::array::from_fn::<_, 3_usize, _>(|_| <i32>::default()).to_vec(),
                 elems: Default::default(),
                 rows: Default::default(),
             }

tests/unit/out/refcount/libc_struct_without_default.rs

@@ -20,7 +20,7 @@ impl Default for UserDefined {
     fn default() -> Self {
         {
             UserDefined {
-                a: std::array::from_fn::<_, 1_u64, _>(|_| <i32>::default()).to_vec(),
+                a: std::array::from_fn::<_, 1_usize, _>(|_| <i32>::default()).to_vec(),
                 v: Default::default(),
             }
         }

tests/unit/out/unsafe/empty_array_init.rs

@@ -13,7 +13,7 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    let mut vec_: Vec<i32> = std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec();
+    let mut vec_: Vec<i32> = std::array::from_fn::<_, 3_usize, _>(|_| <i32>::default()).to_vec();
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/inline_container_fields.rs

@@ -28,7 +28,7 @@ impl Default for State {
             State {
                 count: 0_i32,
                 grid: [[0_i32; 3]; 2],
-                arr: std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec(),
+                arr: std::array::from_fn::<_, 3_usize, _>(|_| <i32>::default()).to_vec(),
                 elems: Default::default(),
                 rows: Default::default(),
             }

tests/unit/out/unsafe/libc_struct_without_default.rs

@@ -16,7 +16,7 @@ impl Default for UserDefined {
     fn default() -> Self {
         unsafe {
             UserDefined {
-                a: std::array::from_fn::<_, 1_u64, _>(|_| <i32>::default()).to_vec(),
+                a: std::array::from_fn::<_, 1_usize, _>(|_| <i32>::default()).to_vec(),
                 v: Default::default(),
             }
         }