Merge branch 'master' into 12-empty-init-list-rule

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -166,8 +166,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void ConvertGlobalVarDecl(clang::VarDecl *decl);
 
-  void ConvertVaListVarDecl(clang::VarDecl *decl);
-
   virtual bool ConvertVarDeclSkipInit(clang::VarDecl *decl);
 
   bool VisitRecordDecl(clang::RecordDecl *decl);
@@ -198,6 +196,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   std::string GetMethodName(const clang::CXXMethodDecl *decl);
 
+  std::string GetConversionName(const clang::CXXConversionDecl *decl) const;
+
   virtual std::string GetSelfMaybeWithMut(const clang::CXXMethodDecl *decl);
 
   std::string GetCtorName(clang::CXXConstructorDecl *decl);
@@ -225,7 +225,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   virtual bool ThisIsRustPtr() const { return false; }
 
   virtual void ConvertCXXConstructorBody(clang::CXXConstructorDecl *decl);
-  void EmitConstructorFieldInits(clang::CXXConstructorDecl *decl);
+  // The object that decl constructs, before its body runs.
+  void EmitConstructorInit(clang::CXXConstructorDecl *decl);
 
   virtual bool VisitCXXConstructorDecl(clang::CXXConstructorDecl *decl);
 
@@ -285,7 +286,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
     const std::string &GetOrMaterialize(
         unsigned argument_num,
-        std::function<std::pair<std::string, std::string>(clang::QualType)>
+        llvm::function_ref<std::pair<std::string, std::string>(clang::QualType)>
             materialize_fn);
 
     // str, preceded by the bindings of the temporaries that it refers to.
@@ -388,6 +389,10 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   void EmitArgList(const CallInfo &info);
 
+  // The variadic arguments, each followed by a comma, converted to VaArg if
+  // into_va_arg.
+  void EmitVariadicArgs(llvm::ArrayRef<clang::Expr *> args, bool into_va_arg);
+
   void EmitCall(CallInfo &&info);
 
   void ConvertGenericCallExpr(clang::CallExpr *expr);
@@ -432,8 +437,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void ConvertVariadicArg(clang::Expr *arg);
 
-  void DefineImplicitMembers(clang::CXXRecordDecl *decl);
-
   bool VisitCallExpr(clang::CallExpr *expr);
 
   virtual bool VisitIntegerLiteral(clang::IntegerLiteral *expr);
@@ -602,8 +605,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   VisitCXXStdInitializerListExpr(clang::CXXStdInitializerListExpr *expr);
 
 protected:
-  const clang::Expr *GetParentExpr(const clang::Expr *expr);
-
 #define StrCat(...) _StrCat(__FUNCTION__, __LINE__, __VA_ARGS__)
 
   inline bool is_empty(char c) { return false; }
@@ -681,7 +682,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   }
 
   virtual bool Convert(clang::QualType qual_type);
-  virtual bool ConvertMappedType(clang::QualType qual_type);
 
   virtual std::string ConvertPointeeType(clang::QualType ptr_type);
 
@@ -742,8 +742,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   void ConvertParamList(llvm::ArrayRef<clang::ParmVarDecl *> params,
                         bool is_variadic);
 
-  virtual void ConvertFunctionQualifiers(clang::FunctionDecl *decl);
-
   virtual void ConvertFunctionReturnType(clang::FunctionDecl *decl);
 
   virtual void ConvertFunctionMain(const clang::FunctionDecl *decl,

cpp2rust/converter/converter.h

@@ -15,7 +15,6 @@
 #include <clang/Sema/Initialization.h>
 #include <clang/Sema/Sema.h>
 #include <llvm/Support/ErrorHandling.h>
-#include <llvm/Support/Path.h>
 #include <llvm/Support/raw_ostream.h>
 
 #include <algorithm>
@@ -384,13 +383,6 @@ bool IsMutatingCall(const clang::CallExpr *expr) {
   return true;
 }
 
-bool IsOverloadedFunction(const clang::FunctionDecl *decl) {
-  const auto *ctx = decl->getDeclContext();
-  const auto decl_name = decl->getDeclName();
-  const auto lookup_result = ctx->lookup(decl_name);
-  return !lookup_result.isSingleResult();
-}
-
 // Calls fn on the defined instantiations of the method templates of decl.
 static void ForEachTemplateInstantiation(
     const clang::CXXRecordDecl *decl,
@@ -501,13 +493,7 @@ bool CanUseCopyOrMoveName(const clang::CXXMethodDecl *decl,
                       return !method->isDeleted() && method_name &&
                              method_name == name;
                     }) == 1;
-  bool is_unique_name =
-      std::none_of(record->method_begin(), record->method_end(),
-                   [&name](const clang::CXXMethodDecl *method) {
-                     return method->getDeclName().isIdentifier() &&
-                            method->getName() == name;
-                   });
-  return is_unique_member && is_unique_name;
+  return is_unique_member && !HasMethodNamed(record, name);
 }
 
 bool IsUserDefinedCopyConstructor(const clang::CXXConstructorDecl *ctor) {
@@ -853,15 +839,6 @@ GetDefaultArgTemporary(const clang::ParmVarDecl *param) {
       param->getDefaultArg()->IgnoreParens());
 }
 
-std::string GetMainFileName(const clang::ASTContext &ctx) {
-  const auto &src_mgr = ctx.getSourceManager();
-  auto file_id = src_mgr.getMainFileID();
-  auto file_entry = src_mgr.getFileEntryRefForID(file_id);
-  auto file_path = file_entry->getName();
-  auto file_name = llvm::sys::path::filename(file_path);
-  return llvm::sys::path::stem(file_name).str();
-}
-
 std::string GetFileName(const clang::Decl *decl) {
   const auto &ctx = decl->getASTContext();
   const auto full_location = ctx.getFullLoc(decl->getBeginLoc());
@@ -1543,18 +1520,12 @@ void ToIdentifier(std::string &name) {
   std::replace(name.begin(), name.end(), '*', 'p');
 }
 
-std::string GetConversionName(const clang::CXXConversionDecl *decl,
-                              const std::string &rust_type) {
-  auto name = "to_" + rust_type;
-  ToIdentifier(name);
-  const auto *record = decl->getParent();
-  bool is_unique_name =
-      std::none_of(record->method_begin(), record->method_end(),
-                   [&name](const clang::CXXMethodDecl *method) {
-                     return method->getDeclName().isIdentifier() &&
-                            method->getName() == name;
-                   });
-  return is_unique_name ? name : GetFunctionBaseName(decl);
+bool HasMethodNamed(const clang::CXXRecordDecl *record, llvm::StringRef name) {
+  return llvm::any_of(record->methods(),
+                      [&](const clang::CXXMethodDecl *method) {
+                        return method->getDeclName().isIdentifier() &&
+                               method->getName() == name;
+                      });
 }
 
 clang::CXXDestructorDecl *

cpp2rust/converter/converter_lib.cpp

@@ -72,8 +72,6 @@ bool RustSizeDivergesFromC(clang::QualType qt);
 
 bool IsMutatingCall(const clang::CallExpr *expr);
 
-bool IsOverloadedFunction(const clang::FunctionDecl *decl);
-
 // The method of a prefix or postfix increment or decrement, or nullptr if
 // opcode is neither.
 const char *GetIncDecMethod(clang::UnaryOperatorKind opcode);
@@ -183,8 +181,6 @@ bool HasUsableDefaultArg(const clang::ParmVarDecl *param);
 const clang::MaterializeTemporaryExpr *
 GetDefaultArgTemporary(const clang::ParmVarDecl *param);
 
-std::string GetMainFileName(const clang::ASTContext &ctx);
-
 std::string GetFileName(const clang::Decl *decl);
 
 unsigned GetLineNumber(const clang::Decl *decl);
@@ -229,8 +225,8 @@ std::string GetFunctionBaseName(const clang::FunctionDecl *decl);
 
 void ToIdentifier(std::string &name);
 
-std::string GetConversionName(const clang::CXXConversionDecl *decl,
-                              const std::string &rust_type);
+// Whether record has a method with the given identifier.
+bool HasMethodNamed(const clang::CXXRecordDecl *record, llvm::StringRef name);
 
 bool IsImplicitAssignmentCall(const clang::CallExpr *expr);
 bool IsUserOperatorCall(const clang::CXXOperatorCallExpr *expr);
@@ -297,22 +293,6 @@ clang::CXXConstructExpr *MakeConstructExpr(clang::ASTContext &ctx,
 std::optional<clang::ArrayRef<clang::TemplateArgument>>
 GetTemplateArgs(clang::QualType qual_type, clang::Expr *expr = nullptr);
 
-template <class UnaryFunction>
-void ForEachTemplateArgument(
-    clang::ArrayRef<clang::TemplateArgument> template_arguments,
-    UnaryFunction unary_function) {
-  for (auto template_argument : template_arguments) {
-    switch (template_argument.getKind()) {
-    case clang::TemplateArgument::ArgKind::Type:
-      unary_function(template_argument.getAsType());
-      break;
-    default:
-      // FIXME: improve logging
-      log() << "unsupported template argument kind\n";
-    }
-  }
-}
-
 clang::Expr *GetCallObject(clang::CallExpr *expr);
 
 clang::Expr *GetCallee(clang::CallExpr *expr);