[arcmt] Merge 'removeEmptyStatements' and 'removeDeallocMethod' passes to cut down on one compilation

pass and increase migration speed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133540 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/ARCMigrate/Transforms.cpp b/lib/ARCMigrate/Transforms.cpp
index 0650e3b94f..3c2e3fc532 100644
--- a/lib/ARCMigrate/Transforms.cpp
+++ b/lib/ARCMigrate/Transforms.cpp
@@ -224,12 +224,9 @@ static void independentTransforms(MigrationPass &pass) {
 std::vector<TransformFn> arcmt::getAllTransformations() {
   std::vector<TransformFn> transforms;
 
-  // This must come first since rewriteAutoreleasePool depends on -release
-  // calls being present to determine the @autorelease ending scope.
   transforms.push_back(independentTransforms);
-
-  transforms.push_back(removeEmptyStatements);
-  transforms.push_back(removeDeallocMethod);
+  // This depends on previous transformations removing various expressions.
+  transforms.push_back(removeEmptyStatementsAndDealloc);
 
   return transforms;
 }