Skip if rust type is the same as cast-to type

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1769,6 +1769,19 @@ void Converter::ConvertIntegralToBooleanCast(clang::ImplicitCastExpr *expr) {
   }
 }
 
+bool Converter::IsSameRustType(clang::Expr *a, clang::Expr *b) {
+  auto get_converted_type_or_mapped_type = [&](clang::Expr *expr) {
+    if (!clang::isa<clang::ImplicitCastExpr>(expr)) {
+      if (const auto *rule = Mapper::GetExprRule(expr)) {
+        return rule->return_type.type;
+      }
+    }
+    return GetUnsafeTypeAsString(expr->getType());
+  };
+  return get_converted_type_or_mapped_type(a) ==
+         get_converted_type_or_mapped_type(b);
+}
+
 bool Converter::VisitImplicitCastExpr(clang::ImplicitCastExpr *expr) {
   auto *sub_expr = expr->getSubExpr();
   auto type = expr->getType();
@@ -1866,8 +1879,7 @@ bool Converter::VisitImplicitCastExpr(clang::ImplicitCastExpr *expr) {
       break;
     }
     // Skip cast if source and target map to the same Rust type.
-    if (GetUnsafeTypeAsString(sub_expr->getType()) ==
-        GetUnsafeTypeAsString(type)) {
+    if (IsSameRustType(sub_expr, expr)) {
       Convert(sub_expr);
       break;
     }
@@ -3109,7 +3121,7 @@ std::string Converter::GetUnsafeTypeAsString(clang::QualType qual_type) const {
   std::string type_as_string;
   Converter converter(type_as_string, ctx_);
   converter.Convert(qual_type);
-  return type_as_string;
+  return std::string(Trim(type_as_string));
 }
 
 void Converter::ConvertVarInit(clang::QualType qual_type, clang::Expr *expr) {
@@ -3545,7 +3557,8 @@ void Converter::ConvertDeref(clang::Expr *expr) {
 
 void Converter::ConvertArrow(clang::Expr *expr) { ConvertDeref(expr); }
 
-void Converter::ConvertCast(clang::QualType qual_type) {
+void Converter::ConvertCast(clang::QualType qual_type, int line) {
+  log() << "[ConvertCast] Called from line " << line << "\n";
   StrCat(keyword::kAs, GetUnsafeTypeAsString(qual_type));
 }
 

cpp2rust/converter/converter.h

@@ -478,7 +478,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void ConvertArrow(clang::Expr *expr);
 
-  virtual void ConvertCast(clang::QualType qual_type);
+  virtual void ConvertCast(clang::QualType qual_type,
+                           int line = __builtin_LINE());
 
   virtual void ConvertLoopVariable(clang::VarDecl *decl,
                                    clang::Expr *range_init);
@@ -685,6 +686,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   TempMaterializationCtx CollectPrvalueToLRefArgs(clang::CallExpr *expr);
 
+  bool IsSameRustType(clang::Expr *a, clang::Expr *b);
+
 private:
   void materializeTemplateSpecialization(clang::CXXRecordDecl *decl);
 

cpp2rust/converter/converter_lib.cpp

@@ -803,7 +803,7 @@ bool SwitchHasFallthrough(clang::SwitchStmt *stmt) {
   return false;
 }
 
-static std::string_view Trim(std::string_view s) {
+std::string_view Trim(std::string_view s) {
   auto is_space = [](unsigned char c) { return std::isspace(c); };
   auto b = std::find_if_not(s.begin(), s.end(), is_space);
   auto e = std::find_if_not(s.rbegin(), s.rend(), is_space).base();

cpp2rust/converter/converter_lib.h

@@ -170,6 +170,8 @@ std::vector<clang::Stmt *> GetSwitchCaseBody(clang::CompoundStmt *body,
 
 bool SwitchHasFallthrough(clang::SwitchStmt *stmt);
 
+std::string_view Trim(std::string_view s);
+
 void Unwrap(std::string &s, std::string_view prefix, std::string_view suffix);
 
 std::string ReplaceAll(std::string str, std::string_view from,