Merge origin/master into copilot/rust-2024-compatibility-fix

Author: Copilot

cpp2rust/converter/converter.cpp

@@ -1635,7 +1635,7 @@ Converter::CallInfo Converter::CollectCallInfo(clang::CallExpr *expr) {
                                : proto->getParamType(i),
         .expr = arg,
         .has_default = function && function->getParamDecl(i)->hasDefaultArg(),
-        .kind = Kind::Hoisted,
+        .kind = IsLiteral(arg) ? Kind::Inline : Kind::Hoisted,
     };
     bool is_materialize = clang::isa<clang::MaterializeTemporaryExpr>(arg);
     if (is_materialize && ca.param_type->isLValueReferenceType()) {
@@ -2373,7 +2373,6 @@ bool Converter::ConvertIncAndDec(clang::UnaryOperator *expr) {
   default:
     return false;
   }
-  std::unreachable();
 }
 
 bool Converter::VisitUnaryOperator(clang::UnaryOperator *expr) {
@@ -2840,7 +2839,7 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
       if (auto arr_ty = ctx_.getAsConstantArrayType(expr->getType())) {
         assert(
             (arr_ty->getSize().getZExtValue() - expr->getNumInits()) &&
-            "Number of initializers should be less that total size of array");
+            "Number of initializers should be less than total size of array");
         for (unsigned i = 0;
              i < arr_ty->getSize().getZExtValue() - expr->getNumInits(); ++i) {
           ConvertVarInit(expr->getArrayFiller()->getType(),
@@ -3028,7 +3027,7 @@ bool Converter::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
   if (ctor->isCopyOrMoveConstructor() ||
       (ctor->isConvertingConstructor(false) && ctor->getNumParams() == 1 &&
        ctor->getParamDecl(0)->getType()->isRValueReferenceType())) {
-    // Take supress before recursing into the child.
+    // Take suppress before recursing into the child.
     bool suppress = PushSuppressIteratorClone::take(*this);
     Convert(expr->getArg(0));
     if (ctor->isCopyConstructor() && !suppress) {

cpp2rust/converter/converter_lib.cpp

@@ -265,6 +265,14 @@ bool IsAsciiStringLiteral(const clang::StringLiteral *str) {
   return true;
 }
 
+bool IsLiteral(const clang::Expr *expr) {
+  expr = expr->IgnoreParenImpCasts();
+  return clang::isa<clang::IntegerLiteral, clang::FloatingLiteral,
+                    clang::StringLiteral, clang::CharacterLiteral,
+                    clang::CXXBoolLiteralExpr, clang::FixedPointLiteral,
+                    clang::ImaginaryLiteral>(expr);
+}
+
 bool IsInitExprOfStringLiteral(const clang::InitListExpr *expr) {
   auto type = expr->getType();
   return expr->getNumInits() == 1 && type->isArrayType() &&

cpp2rust/converter/converter_lib.h

@@ -71,6 +71,8 @@ bool IsAsciiStringLiteral(const clang::StringLiteral *str);
 
 bool IsInitExprOfStringLiteral(const clang::InitListExpr *expr);
 
+bool IsLiteral(const clang::Expr *expr);
+
 std::vector<clang::CXXConstructorDecl *>
 GetTemplateInstantiatedCtors(clang::CXXRecordDecl *decl);
 

tests/benchmarks/out/refcount/bfs.rs

@@ -225,8 +225,7 @@ fn main_0() -> i32 {
     let pred: Value<Ptr<u32>> = Rc::new(RefCell::new(
         ({
             let _graph: Ptr<Graph> = graph.as_pointer();
-            let _start_vertex: u32 = 0_u32;
-            BFS_0(_graph, _start_vertex)
+            BFS_0(_graph, 0_u32)
         }),
     ));
     let i: Value<u32> = Rc::new(RefCell::new(0_u32));

tests/benchmarks/out/refcount/fibonacci.rs

@@ -27,8 +27,5 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    return (({
-        let _n: u64 = 46_u64;
-        fib_0(_n)
-    }) as i32);
+    return (({ fib_0(46_u64) }) as i32);
 }

tests/benchmarks/out/unsafe/bfs.rs

@@ -159,8 +159,7 @@ unsafe fn main_0() -> i32 {
     }
     let mut pred: *mut u32 = (unsafe {
         let _graph: *const Graph = &graph as *const Graph;
-        let _start_vertex: u32 = 0_u32;
-        BFS_0(_graph, _start_vertex)
+        BFS_0(_graph, 0_u32)
     });
     let mut i: u32 = 0_u32;
     'loop_: while ((i as u64) < (V)) {

tests/benchmarks/out/unsafe/fibonacci.rs

@@ -28,8 +28,5 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    return ((unsafe {
-        let _n: u64 = 46_u64;
-        fib_0(_n)
-    }) as i32);
+    return ((unsafe { fib_0(46_u64) }) as i32);
 }

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

@@ -10,13 +10,7 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    assert!(
-        (((({
-            let _x: i32 = 42;
-            helper_0(_x)
-        }) == 43) as i32)
-            != 0)
-    );
+    assert!((((({ helper_0(42,) }) == 43) as i32) != 0));
     return 0;
 }
 pub fn unrelated1_1() -> i32 {

tests/multi-file/extern_functions/out/unsafe/extern_functions.rs

@@ -12,13 +12,7 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    assert!(
-        ((((unsafe {
-            let _x: i32 = 42;
-            helper_0(_x)
-        }) == (43)) as i32)
-            != 0)
-    );
+    assert!(((((unsafe { helper_0(42,) }) == (43)) as i32) != 0));
     return 0;
 }
 pub unsafe fn unrelated1_1() -> i32 {

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

@@ -10,13 +10,7 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    assert!(
-        (((({
-            let _x: i32 = 42;
-            helper_0(_x)
-        }) == 43) as i32)
-            != 0)
-    );
+    assert!((((({ helper_0(42,) }) == 43) as i32) != 0));
     return 0;
 }
 pub fn unrelated1_1() -> i32 {