Add more builtin types

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -138,6 +138,7 @@ bool Converter::VisitBuiltinType(clang::BuiltinType *type) {
     StrCat("f32");
     break;
   case clang::BuiltinType::Double:
+  case clang::BuiltinType::LongDouble:
     StrCat("f64");
     break;
   case clang::BuiltinType::Char_S:
@@ -158,6 +159,11 @@ bool Converter::VisitBuiltinType(clang::BuiltinType *type) {
   case clang::BuiltinType::Int:
   case clang::BuiltinType::Long:
   case clang::BuiltinType::LongLong:
+  case clang::BuiltinType::WChar_S:
+  case clang::BuiltinType::WChar_U:
+  case clang::BuiltinType::Char8:
+  case clang::BuiltinType::Char16:
+  case clang::BuiltinType::Char32:
     StrCat(std::format("{}{}", type->isSignedInteger() ? 'i' : 'u',
                        ctx_.getTypeSize(type)));
     break;
@@ -170,9 +176,13 @@ bool Converter::VisitBuiltinType(clang::BuiltinType *type) {
   case clang::BuiltinType::Int128:
     StrCat("i128");
     break;
+  case clang::BuiltinType::NullPtr:
+    Convert(ctx_.VoidPtrTy);
+    break;
   default:
-    // FIXME: improve error handling
-    log() << "unsupported builtin type\n";
+    llvm::errs() << "unsupported builtin type: "
+                 << type->getName(ctx_.getPrintingPolicy()) << '\n';
+    assert(0 && "unsupported builtin type\n");
     break;
   }
   return false;

libcc2rs/src/reinterpret.rs

@@ -62,6 +62,8 @@ impl_byte_repr!(u32);
 impl_byte_repr!(i32);
 impl_byte_repr!(u64);
 impl_byte_repr!(i64);
+impl_byte_repr!(u128);
+impl_byte_repr!(i128);
 impl_byte_repr!(usize);
 impl_byte_repr!(isize);
 impl_byte_repr!(f32);

tests/unit/out/refcount/types.rs

@@ -21,6 +21,12 @@ fn main_0() -> i32 {
     let xi3: Value<i32> = Rc::new(RefCell::new(32));
     let xi4: Value<i64> = Rc::new(RefCell::new(64_i64));
     let b: Value<bool> = Rc::new(RefCell::new(((*xu64.borrow()) == 64_u64)));
+    let xld: Value<f64> = Rc::new(RefCell::new(1.5E+0));
+    let xwc: Value<i32> = Rc::new(RefCell::new(65_i32));
+    let xc8: Value<u8> = Rc::new(RefCell::new(66_u8));
+    let xc16: Value<u16> = Rc::new(RefCell::new(67_u16));
+    let xc32: Value<u32> = Rc::new(RefCell::new(68_u32));
+    let xnp: Value<Value<AnyPtr>> = Rc::new(RefCell::new(Default::default()));
     assert!(
         (((((((((((((*xu8.borrow()) as i32) + ((*xu16.borrow()) as i32)) as u32)
             .wrapping_add((*xu32.borrow()))) as u64)
@@ -33,5 +39,12 @@ fn main_0() -> i32 {
         .wrapping_add(((*xi4.borrow()) as u64))
             == 352_u64)
     );
+    assert!((((*xld.borrow()) * 2_f64) == 3_f64));
+    assert!(
+        (((((*xwc.borrow()) + ((*xc8.borrow()) as i32)) + ((*xc16.borrow()) as i32)) as u32)
+            .wrapping_add((*xc32.borrow()))
+            == 266_u32)
+    );
+    assert!((<AnyPtr>::default()).is_null());
     return 0;
 }

tests/unit/out/unsafe/types.rs

@@ -23,6 +23,12 @@ unsafe fn main_0() -> i32 {
     let mut xi3: i32 = 32;
     let mut xi4: i64 = 64_i64;
     let mut b: bool = ((xu64) == (64_u64));
+    let mut xld: f64 = 1.5E+0;
+    let mut xwc: i32 = 65_i32;
+    let mut xc8: u8 = 66_u8;
+    let mut xc16: u16 = 67_u16;
+    let mut xc32: u32 = 68_u32;
+    let mut xnp: *mut ::libc::c_void = Default::default();
     assert!(
         (((((((((((((xu8 as i32) + (xu16 as i32)) as u32).wrapping_add(xu32)) as u64)
             .wrapping_add(xu64))
@@ -34,5 +40,8 @@ unsafe fn main_0() -> i32 {
         .wrapping_add((xi4 as u64)))
             == (352_u64))
     );
+    assert!((((xld) * (2_f64)) == (3_f64)));
+    assert!(((((((xwc) + (xc8 as i32)) + (xc16 as i32)) as u32).wrapping_add(xc32)) == (266_u32)));
+    assert!((<*mut ::libc::c_void>::default()).is_null());
     return 0;
 }

tests/unit/types.cpp

@@ -1,5 +1,4 @@
-// Copyright (c) 2022-present INESC-ID.
-// Distributed under the MIT license that can be found in the LICENSE file.
+// ADDITIONAL_COMPILE_FLAGS: -std=c++23
 
 #include <cassert>
 #include <cstddef>
@@ -18,6 +17,15 @@ int main() {
   int32_t xi3 = 32;
   int64_t xi4 = 64;
   bool b = (xu64 == 64ULL);
+  long double xld = 1.5;
+  wchar_t xwc = 65;
+  char8_t xc8 = 66;
+  char16_t xc16 = 67;
+  char32_t xc32 = 68;
+  std::nullptr_t xnp = nullptr;
   assert(xu8 + xu16 + xu32 + xu64 + xsz1 + xsz2 + xi1 + xi2 + xi3 + xi4 == 352);
+  assert(xld * 2 == 3);
+  assert(xwc + xc8 + xc16 + xc32 == 266);
+  assert(xnp == nullptr);
   return 0;
 }