Merge branch 'master' into issue-535

Author: lucic71

cpp2rust/compat/arpa/inet.h

@@ -8,10 +8,16 @@
 #undef htonl
 #undef htons
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 uint32_t cpp2rust_ntohl(uint32_t x);
 uint16_t cpp2rust_ntohs(uint16_t x);
 uint32_t cpp2rust_htonl(uint32_t x);
 uint16_t cpp2rust_htons(uint16_t x);
+#ifdef __cplusplus
+}
+#endif
 
 #define ntohl(x) cpp2rust_ntohl(x)
 #define ntohs(x) cpp2rust_ntohs(x)

cpp2rust/compat/errno.h

@@ -5,6 +5,12 @@
 
 #undef errno
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 int *cpp2rust_errno(void);
+#ifdef __cplusplus
+}
+#endif
 
 #define errno (*cpp2rust_errno())

cpp2rust/compat/sys/select.h

@@ -8,10 +8,16 @@
 #undef FD_ISSET
 #undef FD_ZERO
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 void cpp2rust_fd_set(int fd, fd_set *set);
 void cpp2rust_fd_clr(int fd, fd_set *set);
 int cpp2rust_fd_isset(int fd, const fd_set *set);
 void cpp2rust_fd_zero(fd_set *set);
+#ifdef __cplusplus
+}
+#endif
 
 #define FD_SET(fd, set) cpp2rust_fd_set(fd, set)
 #define FD_CLR(fd, set) cpp2rust_fd_clr(fd, set)

cpp2rust/converter/rules/expr_matcher.cpp

@@ -75,7 +75,7 @@ using ResolvedDecl =
 ResolvedDecl getResolvedDecl(clang::ASTContext &ctx, const clang::Expr *expr,
                              bool must_resolve) {
   expr = RuleDecls::SkipImplicit(expr);
-  if (llvm::isa<clang::IntegerLiteral>(expr) &&
+  if (llvm::isa<clang::IntegerLiteral, clang::AtomicExpr>(expr) &&
       expr->getBeginLoc().isMacroID()) {
     return MacroUsage{
         clang::Lexer::getImmediateMacroName(

cpp2rust/converter/rules/rule_keys.cpp

@@ -123,7 +123,7 @@ std::optional<ExprKey> getDeclKey(const clang::NamedDecl *decl) {
 std::optional<ExprKey> getExprKey(clang::ASTContext &ctx,
                                   const clang::Expr *expr) {
   expr = RuleDecls::SkipImplicit(expr);
-  if (llvm::isa<clang::IntegerLiteral>(expr) &&
+  if (llvm::isa<clang::IntegerLiteral, clang::AtomicExpr>(expr) &&
       expr->getBeginLoc().isMacroID()) {
     auto macro = clang::Lexer::getImmediateMacroName(
         expr->getBeginLoc(), ctx.getSourceManager(), ctx.getLangOpts());

cpp2rust/converter/rules/rules_loader.cpp

@@ -474,7 +474,7 @@ std::string DeclKey(const clang::NamedDecl *decl) {
 
 std::string ExprKey(clang::ASTContext &ctx, const clang::Expr *expr) {
   expr = expr->IgnoreParenImpCasts();
-  if (llvm::isa<clang::IntegerLiteral>(expr) &&
+  if (llvm::isa<clang::IntegerLiteral, clang::AtomicExpr>(expr) &&
       expr->getBeginLoc().isMacroID()) {
     return clang::Lexer::getImmediateMacroName(
                expr->getBeginLoc(), ctx.getSourceManager(), ctx.getLangOpts())
@@ -523,7 +523,8 @@ std::string TypeKey(clang::QualType type) {
           llvm::dyn_cast<clang::TypeOfExprType>(type.getTypePtr())) {
     type = typeof_type->getUnderlyingExpr()->getType();
   }
-  if (auto alias = type->getAs<clang::TypedefType>()) {
+  if (auto alias = type->getAs<clang::TypedefType>();
+      alias && !type.getCanonicalType()->getAsTagDecl()) {
     return DeclKey(alias->getDecl());
   }
   if (auto sugar = type->getAs<clang::PredefinedSugarType>()) {

cpp2rust/rule_preprocessing/cpp_rule_indexer.cpp

@@ -215,6 +215,9 @@ std::string ExprKey(clang::ASTContext &ctx, const clang::Decl *rule) {
 
 std::string TypeKey(const clang::TypedefNameDecl *rule) {
   auto type = rule->getUnderlyingType();
+  if (auto key = RulesLoader::TypeKey(type); !key.empty()) {
+    return key;
+  }
   if (!type->isDependentType() && type->getAs<clang::TypedefType>()) {
     return RulesLoader::TypeKey(type);
   }

rules/signal/src.c

@@ -5,6 +5,8 @@
 #define _GNU_SOURCE
 #include <signal.h>
 
+typedef sig_t t1;
+
 int f1(int signum, const struct sigaction *act, struct sigaction *oldact) {
   return sigaction(signum, act, oldact);
 }

rules/signal/tgt_refcount.rs

@@ -0,0 +1,8 @@
+// Copyright (c) 2022-present INESC-ID.
+// Distributed under the MIT license that can be found in the LICENSE file.
+
+use libcc2rs::*;
+
+fn t1() -> FnPtr<fn(i32)> {
+    FnPtr::null()
+}

rules/signal/tgt_unsafe.rs

@@ -1,6 +1,10 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+fn t1() -> Option<unsafe fn(i32)> {
+    None
+}
+
 unsafe fn f1(a0: i32, a1: *const ::libc::sigaction, a2: *mut ::libc::sigaction) -> i32 {
     libc::sigaction(a0, a1, a2)
 }