Delete StripFunctionPointerDecay

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1455,8 +1455,8 @@ void Converter::ConvertGenericCallExpr(clang::CallExpr *expr) {
   if (proto && !function) {
     EmitFnPtrCall(callee);
   } else {
-    PushExprKind push(*this, ExprKind::RValue);
-    Convert(StripFunctionPointerDecay(callee));
+    PushExprKind push(*this, ExprKind::Callee);
+    Convert(callee);
   }
   StrCat(token::kOpenParen);
   for (unsigned i = 0; i < num_named_params && i < num_args; ++i) {
@@ -1674,8 +1674,12 @@ bool Converter::VisitImplicitCastExpr(clang::ImplicitCastExpr *expr) {
   }
   case clang::CastKind::CK_FunctionToPointerDecay:
   case clang::CastKind::CK_BuiltinFnToFnPtr: {
-    PushExprKind push(*this, ExprKind::AddrOf);
-    Convert(sub_expr);
+    if (isCallee()) {
+      Convert(sub_expr);
+    } else {
+      PushExprKind push(*this, ExprKind::AddrOf);
+      Convert(sub_expr);
+    }
     break;
   }
   case clang::CastKind::CK_ConstructorConversion:
@@ -3234,7 +3238,12 @@ void Converter::PlaceholderCtx::dump() const {
 
 std::string Converter::ConvertPlaceholder(clang::Expr *expr, clang::Expr *arg,
                                           const PlaceholderCtx &ph_ctx) {
-  arg = StripFunctionPointerDecay(arg);
+  if (arg->getType()->isFunctionPointerType()) {
+    PushExprKind push(*this, ExprKind::Callee);
+    Buffer buf(*this);
+    Convert(arg);
+    return std::move(buf).str();
+  }
 
   if (ph_ctx.needs_materialization()) {
     auto materialized = ph_ctx.materialize_ctx->GetOrMaterialize(
@@ -3383,6 +3392,10 @@ bool Converter::isVoid() const {
   return curr_expr_kind_.empty() || curr_expr_kind_.back() == ExprKind::Void;
 }
 
+bool Converter::isCallee() const {
+  return !curr_expr_kind_.empty() && curr_expr_kind_.back() == ExprKind::Callee;
+}
+
 void Converter::SetFresh() {
   switch (computed_expr_type_) {
   case ComputedExprType::Value:

cpp2rust/converter/converter.h

@@ -477,6 +477,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   static std::unordered_set<std::string> abstract_structs_;
 
   enum class ExprKind : uint8_t {
+    Callee,
     LValue,
     RValue,
     XValue,
@@ -487,6 +488,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   inline std::string expr_kind_to_string(ExprKind kind) {
     switch (kind) {
+    case ExprKind::Callee:
+      return "Callee";
     case ExprKind::LValue:
       return "LValue";
     case ExprKind::RValue:
@@ -510,6 +513,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   bool isAddrOf() const;
   bool isObject() const;
   bool isVoid() const;
+  bool isCallee() const;
 
   void dump_expr_kinds();
 

cpp2rust/converter/converter_lib.cpp

@@ -338,17 +338,6 @@ clang::QualType GetReturnTypeOfFunction(const clang::CallExpr *expr) {
   return {};
 }
 
-clang::Expr *StripFunctionPointerDecay(clang::Expr *expr) {
-  if (auto *ice = clang::dyn_cast<clang::ImplicitCastExpr>(expr)) {
-    auto ck = ice->getCastKind();
-    if (ck == clang::CK_FunctionToPointerDecay ||
-        ck == clang::CK_BuiltinFnToFnPtr) {
-      return ice->getSubExpr();
-    }
-  }
-  return expr;
-}
-
 std::string GetOverloadedOperator(const clang::FunctionDecl *decl) {
   switch (decl->getOverloadedOperator()) {
   case clang::OO_Less:

cpp2rust/converter/converter_lib.h

@@ -91,8 +91,6 @@ template <class T> llvm::SmallString<16> GetNumAsString(const T &num) {
 
 clang::QualType GetReturnTypeOfFunction(const clang::CallExpr *expr);
 
-clang::Expr *StripFunctionPointerDecay(clang::Expr *expr);
-
 std::string GetOverloadedOperator(const clang::FunctionDecl *decl);
 
 bool IsOverloadedComparisonOperator(const clang::CXXMethodDecl *decl);

tests/unit/out/refcount/lambda_capture_pass.rs

@@ -12,7 +12,7 @@ pub fn apply_0(fn_: impl Fn(i32) -> i32, x: i32) -> i32 {
     let x: Value<i32> = Rc::new(RefCell::new(x));
     return ({
         let _x: i32 = (*x.borrow());
-        (*fn_.borrow())(_x)
+        (*fn_.borrow_mut())(_x)
     })
     .clone();
 }
@@ -21,7 +21,7 @@ pub fn apply_1(fn_: impl Fn(i32) -> i32, x: i32) -> i32 {
     let x: Value<i32> = Rc::new(RefCell::new(x));
     return ({
         let _x: i32 = (*x.borrow());
-        (*fn_.borrow())(_x)
+        (*fn_.borrow_mut())(_x)
     })
     .clone();
 }

tests/unit/out/refcount/lambda_nested.rs

@@ -23,22 +23,22 @@ fn main_0() -> i32 {
             ));
             return ({
                 let _z: i32 = 1;
-                (*inner.borrow())(_z)
+                (*inner.borrow_mut())(_z)
             })
             .clone();
         }),
     ));
     assert!(
         (({
             let _y: i32 = 20;
-            (*outer.borrow())(_y)
+            (*outer.borrow_mut())(_y)
         }) == 31)
     );
     (*x.borrow_mut()) = 100;
     assert!(
         (({
             let _y: i32 = 20;
-            (*outer.borrow())(_y)
+            (*outer.borrow_mut())(_y)
         }) == 121)
     );
     return 0;