Save CallExpr instead of callee in CallInfo

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1528,20 +1528,20 @@ Converter::CallInfo Converter::CollectCallInfo(clang::CallExpr *expr) {
   using Kind = CallArg::Kind;
 
   CallInfo info;
-  info.callee = expr->getCallee();
+  info.expr = expr;
+  auto callee = GetCallee(expr);
   unsigned arg_begin = 0;
   if (auto op_call = llvm::dyn_cast<clang::CXXOperatorCallExpr>(expr)) {
     if (op_call->getOperator() == clang::OO_Call) {
-      info.callee = op_call->getArg(0);
       arg_begin = 1;
     }
   }
 
-  const auto *function =
-      expr->getCalleeDecl() ? expr->getCalleeDecl()->getAsFunction() : nullptr;
+  auto decl = expr->getCalleeDecl();
+  const auto *function = decl ? decl->getAsFunction() : nullptr;
   const clang::FunctionProtoType *proto = nullptr;
   if (!function) {
-    auto callee_ty = info.callee->getType().getDesugaredType(ctx_);
+    auto callee_ty = callee->getType().getDesugaredType(ctx_);
     if (auto ptr_ty = callee_ty->getAs<clang::PointerType>()) {
       proto = ptr_ty->getPointeeType()->getAs<clang::FunctionProtoType>();
     }
@@ -1658,10 +1658,14 @@ void Converter::EmitCall(CallInfo &&info) {
   EmitHoistedArgs(info);
 
   if (info.is_fn_ptr_call) {
-    EmitFnPtrCall(info.callee);
+    EmitFnPtrCall(GetCallee(info.expr));
+  } else if (info.is_libc_passthrough) {
+    auto *direct_callee = info.expr->getDirectCallee();
+    assert(direct_callee);
+    StrCat("libc::", direct_callee->getName());
   } else {
     PushExprKind push(*this, ExprKind::Callee);
-    Convert(info.callee);
+    Convert(GetCallee(info.expr));
   }
 
   EmitArgList(info);

cpp2rust/converter/converter.h

@@ -235,9 +235,10 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   };
 
   struct CallInfo {
-    clang::Expr *callee;
+    clang::CallExpr *expr;
     bool is_variadic;
     bool is_fn_ptr_call;
+    bool is_libc_passthrough;
     std::vector<CallArg> args;
     std::vector<clang::Expr *> variadic_args;
   };

cpp2rust/converter/converter_lib.cpp

@@ -588,6 +588,15 @@ BuildUnifiedArgs(clang::Expr *expr, clang::Expr **args, unsigned num_args) {
   return all_args;
 }
 
+clang::Expr *GetCallee(clang::CallExpr *expr) {
+  if (auto op_call = clang::dyn_cast<clang::CXXOperatorCallExpr>(expr)) {
+    if (op_call->getOperator() == clang::OO_Call) {
+      return op_call->getArg(0);
+    }
+  }
+  return expr->getCallee();
+}
+
 clang::Expr *GetCalleeOrExpr(clang::Expr *expr) {
   if (auto *call = clang::dyn_cast<clang::CallExpr>(expr)) {
     return call->getCallee();

cpp2rust/converter/converter_lib.h

@@ -129,6 +129,8 @@ void ForEachTemplateArgument(
 
 clang::Expr *GetCallObject(clang::CallExpr *expr);
 
+clang::Expr *GetCallee(clang::CallExpr *expr);
+
 clang::Expr *GetCalleeOrExpr(clang::Expr *expr);
 
 bool HasReceiver(clang::Expr *expr);