Migrate most visitors off CRTP BodyTransform

Author: Sirraide

clang/lib/ARCMigrate/TransAutoreleasePool.cpp

@@ -65,18 +65,25 @@ class ReleaseCollector : public DynamicRecursiveASTVisitor {
 
 namespace {
 
-class AutoreleasePoolRewriter : public DynamicRecursiveASTVisitor {
+class AutoreleasePoolRewriter : public BodyTransform {
+  bool TraversingBody = false;
+
 public:
   AutoreleasePoolRewriter(MigrationPass &pass)
-    : Body(nullptr), Pass(pass) {
+      : BodyTransform(pass), Body(nullptr) {
     PoolII = &pass.Ctx.Idents.get("NSAutoreleasePool");
     DrainSel = pass.Ctx.Selectors.getNullarySelector(
                                                  &pass.Ctx.Idents.get("drain"));
   }
 
-  void transformBody(Stmt *body, Decl *ParentD) {
+  bool TraverseStmt(Stmt *body) override {
+    if (TraversingBody)
+      return BodyTransform::TraverseStmt(body);
+
+    llvm::SaveAndRestore Restore{TraversingBody, true};
     Body = body;
-    TraverseStmt(body);
+    BodyTransform::TraverseStmt(body);
+    return true;
   }
 
   ~AutoreleasePoolRewriter() override {
@@ -410,7 +417,6 @@ class AutoreleasePoolRewriter : public DynamicRecursiveASTVisitor {
   }
 
   Stmt *Body;
-  MigrationPass &Pass;
 
   IdentifierInfo *PoolII;
   Selector DrainSel;
@@ -429,6 +435,6 @@ class AutoreleasePoolRewriter : public DynamicRecursiveASTVisitor {
 } // anonymous namespace
 
 void trans::rewriteAutoreleasePool(MigrationPass &pass) {
-  BodyTransform<AutoreleasePoolRewriter> trans(pass);
+  AutoreleasePoolRewriter trans(pass);
   trans.TraverseDecl(pass.Ctx.getTranslationUnitDecl());
 }

clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp

@@ -32,29 +32,34 @@ using namespace trans;
 
 namespace {
 
-class RetainReleaseDeallocRemover : public DynamicRecursiveASTVisitor {
+class RetainReleaseDeallocRemover : public BodyTransform {
   Stmt *Body;
-  MigrationPass &Pass;
 
   ExprSet Removables;
   std::unique_ptr<ParentMap> StmtMap;
+  bool TraversingBody = false;
 
   Selector DelegateSel, FinalizeSel;
 
 public:
   RetainReleaseDeallocRemover(MigrationPass &pass)
-    : Body(nullptr), Pass(pass) {
+      : BodyTransform(pass), Body(nullptr) {
     DelegateSel =
         Pass.Ctx.Selectors.getNullarySelector(&Pass.Ctx.Idents.get("delegate"));
     FinalizeSel =
         Pass.Ctx.Selectors.getNullarySelector(&Pass.Ctx.Idents.get("finalize"));
   }
 
-  void transformBody(Stmt *body, Decl *ParentD) {
+  bool TraverseStmt(Stmt *body) override {
+    if (TraversingBody)
+      return BodyTransform::TraverseStmt(body);
+
+    llvm::SaveAndRestore Restore{TraversingBody, true};
     Body = body;
     collectRemovables(body, Removables);
     StmtMap.reset(new ParentMap(body));
-    TraverseStmt(body);
+    BodyTransform::TraverseStmt(body);
+    return true;
   }
 
   bool VisitObjCMessageExpr(ObjCMessageExpr *E) override {
@@ -453,6 +458,6 @@ class RetainReleaseDeallocRemover : public DynamicRecursiveASTVisitor {
 } // anonymous namespace
 
 void trans::removeRetainReleaseDeallocFinalize(MigrationPass &pass) {
-  BodyTransform<RetainReleaseDeallocRemover> trans(pass);
+  RetainReleaseDeallocRemover trans(pass);
   trans.TraverseDecl(pass.Ctx.getTranslationUnitDecl());
 }

clang/lib/ARCMigrate/TransUnbridgedCasts.cpp

@@ -462,6 +462,6 @@ class UnbridgedCastRewriter : public DynamicRecursiveASTVisitor {
 } // end anonymous namespace
 
 void trans::rewriteUnbridgedCasts(MigrationPass &pass) {
-  BodyTransform<UnbridgedCastRewriter> trans(pass);
+  BodyTransform_OLD<UnbridgedCastRewriter> trans(pass);
   trans.TraverseDecl(pass.Ctx.getTranslationUnitDecl());
 }

clang/lib/ARCMigrate/TransUnusedInitDelegate.cpp

@@ -31,20 +31,24 @@ using namespace trans;
 
 namespace {
 
-class UnusedInitRewriter : public DynamicRecursiveASTVisitor {
+class UnusedInitRewriter : public BodyTransform {
   Stmt *Body;
-  MigrationPass &Pass;
-
   ExprSet Removables;
+  bool TraversingBody = false;
 
 public:
   UnusedInitRewriter(MigrationPass &pass)
-    : Body(nullptr), Pass(pass) { }
+      : BodyTransform(pass), Body(nullptr) {}
+
+  bool TraverseStmt(Stmt *body) override {
+    if (TraversingBody)
+      return BodyTransform::TraverseStmt(body);
 
-  void transformBody(Stmt *body, Decl *ParentD) {
+    llvm::SaveAndRestore Restore{TraversingBody, true};
     Body = body;
     collectRemovables(body, Removables);
-    TraverseStmt(body);
+    BodyTransform::TraverseStmt(body);
+    return true;
   }
 
   bool VisitObjCMessageExpr(ObjCMessageExpr *ME) override {
@@ -73,6 +77,6 @@ class UnusedInitRewriter : public DynamicRecursiveASTVisitor {
 } // anonymous namespace
 
 void trans::rewriteUnusedInitDelegate(MigrationPass &pass) {
-  BodyTransform<UnusedInitRewriter> trans(pass);
+  UnusedInitRewriter trans(pass);
   trans.TraverseDecl(pass.Ctx.getTranslationUnitDecl());
 }

clang/lib/ARCMigrate/Transforms.h

@@ -9,6 +9,7 @@
 #ifndef LLVM_CLANG_LIB_ARCMIGRATE_TRANSFORMS_H
 #define LLVM_CLANG_LIB_ARCMIGRATE_TRANSFORMS_H
 
+#include "clang/AST/DynamicRecursiveASTVisitor.h"
 #include "clang/AST/ParentMap.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "llvm/ADT/DenseSet.h"
@@ -182,13 +183,15 @@ bool isGlobalVar(Expr *E);
 StringRef getNilString(MigrationPass &Pass);
 
 template <typename BODY_TRANS>
-class BodyTransform : public RecursiveASTVisitor<BodyTransform<BODY_TRANS> > {
+class BodyTransform_OLD
+    : public RecursiveASTVisitor<BodyTransform_OLD<BODY_TRANS>> {
   MigrationPass &Pass;
   Decl *ParentD;
 
-  typedef RecursiveASTVisitor<BodyTransform<BODY_TRANS> > base;
+  typedef RecursiveASTVisitor<BodyTransform_OLD<BODY_TRANS>> base;
+
 public:
-  BodyTransform(MigrationPass &pass) : Pass(pass), ParentD(nullptr) { }
+  BodyTransform_OLD(MigrationPass &pass) : Pass(pass), ParentD(nullptr) {}
 
   bool TraverseStmt(Stmt *rootS) {
     if (rootS)
@@ -202,6 +205,20 @@ class BodyTransform : public RecursiveASTVisitor<BodyTransform<BODY_TRANS> > {
   }
 };
 
+class BodyTransform : public DynamicRecursiveASTVisitor {
+protected:
+  MigrationPass &Pass;
+  Decl *ParentD;
+
+public:
+  BodyTransform(MigrationPass &pass) : Pass(pass), ParentD(nullptr) {}
+
+  bool TraverseObjCMethodDecl(ObjCMethodDecl *D) override {
+    SaveAndRestore<Decl *> SetParent(ParentD, D);
+    return DynamicRecursiveASTVisitor::TraverseObjCMethodDecl(D);
+  }
+};
+
 typedef llvm::DenseSet<Expr *> ExprSet;
 
 void clearRefsIn(Stmt *S, ExprSet &refs);