Swift: make visit arguments references instead of pointers

Author: redsun82

swift/extractor/infra/SwiftDispatcher.h

@@ -105,7 +105,11 @@ class SwiftDispatcher {
       return *l;
     }
     waitingForNewLabel = e;
-    visit(e, std::forward<Args>(args)...);
+    if constexpr (std::is_pointer_v<E>) {
+      visit(*e, std::forward<Args>(args)...);
+    } else {
+      visit(e, std::forward<Args>(args)...);
+    }
     // TODO when everything is moved to structured C++ classes, this should be moved to createEntry
     if (auto l = store.get(e)) {
       if constexpr (IsLocatable<E>) {
@@ -331,15 +335,15 @@ class SwiftDispatcher {
   // TODO: for const correctness these should consistently be `const` (and maybe const references
   // as we don't expect `nullptr` here. However `swift::ASTVisitor` and `swift::TypeVisitor` do not
   // accept const pointers
-  virtual void visit(const swift::Decl* decl) = 0;
-  virtual void visit(const swift::Stmt* stmt) = 0;
-  virtual void visit(const swift::StmtCondition* cond) = 0;
-  virtual void visit(const swift::StmtConditionElement* cond) = 0;
-  virtual void visit(const swift::CaseLabelItem* item) = 0;
-  virtual void visit(const swift::Expr* expr) = 0;
-  virtual void visit(const swift::Pattern* pattern) = 0;
-  virtual void visit(const swift::TypeRepr* typeRepr, swift::Type type) = 0;
-  virtual void visit(swift::TypeBase* type) = 0;
+  virtual void visit(const swift::Decl& decl) = 0;
+  virtual void visit(const swift::Stmt& stmt) = 0;
+  virtual void visit(const swift::StmtCondition& cond) = 0;
+  virtual void visit(const swift::StmtConditionElement& cond) = 0;
+  virtual void visit(const swift::CaseLabelItem& item) = 0;
+  virtual void visit(const swift::Expr& expr) = 0;
+  virtual void visit(const swift::Pattern& pattern) = 0;
+  virtual void visit(const swift::TypeRepr& typeRepr, swift::Type type) = 0;
+  virtual void visit(const swift::TypeBase& type) = 0;
 
   void visit(const std::filesystem::path& file) {
     auto entry = createEntry(file, file.string());

swift/extractor/translators/SwiftVisitor.h

@@ -21,22 +21,22 @@ class SwiftVisitor : private SwiftDispatcher {
   void extract(swift::Token& comment) { emitComment(comment); }
 
  private:
-  void visit(const swift::Decl* decl) override { declTranslator.translateAndEmit(decl); }
-  void visit(const swift::Stmt* stmt) override { stmtTranslator.translateAndEmit(stmt); }
-  void visit(const swift::StmtCondition* cond) override { stmtTranslator.translateAndEmit(*cond); }
-  void visit(const swift::StmtConditionElement* element) override {
-    stmtTranslator.translateAndEmit(*element);
+  void visit(const swift::Decl& decl) override { declTranslator.translateAndEmit(decl); }
+  void visit(const swift::Stmt& stmt) override { stmtTranslator.translateAndEmit(stmt); }
+  void visit(const swift::StmtCondition& cond) override { stmtTranslator.translateAndEmit(cond); }
+  void visit(const swift::StmtConditionElement& element) override {
+    stmtTranslator.translateAndEmit(element);
   }
 
-  void visit(const swift::CaseLabelItem* item) override { stmtTranslator.translateAndEmit(*item); }
-  void visit(const swift::Expr* expr) override { exprTranslator.translateAndEmit(expr); }
-  void visit(const swift::Pattern* pattern) override {
+  void visit(const swift::CaseLabelItem& item) override { stmtTranslator.translateAndEmit(item); }
+  void visit(const swift::Expr& expr) override { exprTranslator.translateAndEmit(expr); }
+  void visit(const swift::Pattern& pattern) override {
     patternTranslator.translateAndEmit(pattern);
   }
 
-  void visit(swift::TypeBase* type) override { typeTranslator.translateAndEmit(type); }
-  void visit(const swift::TypeRepr* typeRepr, swift::Type type) override {
-    typeTranslator.translateAndEmit(*typeRepr, type);
+  void visit(const swift::TypeBase& type) override { typeTranslator.translateAndEmit(type); }
+  void visit(const swift::TypeRepr& typeRepr, swift::Type type) override {
+    typeTranslator.translateAndEmit(typeRepr, type);
   }
 
   DeclTranslator declTranslator{*this};

swift/extractor/translators/TranslatorBase.h

@@ -87,8 +87,8 @@ class AstTranslatorBase : private swift::ASTVisitor<CrtpSubclass>,
   // route the visit to translateXXX functions only if they take const references to swift
   // entities (see HasTranslate##CLASS##KIND above)
   template <typename E>
-  void translateAndEmit(const E* entity) {
-    swift::ASTVisitor<CrtpSubclass>::visit(const_cast<E*>(entity));
+  void translateAndEmit(const E& entity) {
+    swift::ASTVisitor<CrtpSubclass>::visit(const_cast<E*>(&entity));
   }
 
  private:
@@ -122,8 +122,8 @@ class TypeTranslatorBase : private swift::TypeVisitor<CrtpSubclass>,
   // swift does not provide const visitors. The following const_cast is safe, as we privately
   // route the visit to translateXXX functions only if they take const references to swift
   // entities (see HasTranslate##CLASS##KIND above)
-  void translateAndEmit(const swift::TypeBase* type) {
-    swift::TypeVisitor<CrtpSubclass>::visit(const_cast<swift::TypeBase*>(type));
+  void translateAndEmit(const swift::TypeBase& type) {
+    swift::TypeVisitor<CrtpSubclass>::visit(const_cast<swift::TypeBase*>(&type));
   }
 
  private: