commit b1086a9c6d6d5ee3070a68076f38eec841cefd58
author Cameron Zwarich <zwarich@apple.com> Mon Jan 17 07:26:51 2011 +0000
committer Cameron Zwarich <zwarich@apple.com> Mon Jan 17 07:26:51 2011 +0000
tree b9674ae45492536e692392c897e7bdea926532c4
parent 119266c4ae2803e11229034b74813242b5978566

Roll out r123609 due to failures on the llvm-x86_64-linux-checks bot.


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

lib/Transforms/Scalar/ScalarReplAggregates.cpp

diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp
index 5c90a36..a068556 100644
--- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp
+++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp
@@ -152,6 +152,7 @@
     // will not alter the CFG, so say so.
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<DominatorTree>();
+      AU.addRequired<DominanceFrontier>();
       AU.setPreservesCFG();
     }
   };
@@ -179,6 +180,7 @@
 INITIALIZE_PASS_BEGIN(SROA_DF, "scalarrepl",
                 "Scalar Replacement of Aggregates (DF)", false, false)
 INITIALIZE_PASS_DEPENDENCY(DominatorTree)
+INITIALIZE_PASS_DEPENDENCY(DominanceFrontier)
 INITIALIZE_PASS_END(SROA_DF, "scalarrepl",
                 "Scalar Replacement of Aggregates (DF)", false, false)
 
@@ -875,8 +877,11 @@
 bool SROA::performPromotion(Function &F) {
   std::vector<AllocaInst*> Allocas;
   DominatorTree *DT = 0;
-  if (HasDomFrontiers)
+  DominanceFrontier *DF = 0;
+  if (HasDomFrontiers) {
     DT = &getAnalysis<DominatorTree>();
+    DF = &getAnalysis<DominanceFrontier>();
+  }
 
   BasicBlock &BB = F.getEntryBlock();  // Get the entry node for the function
 
@@ -895,7 +900,7 @@
     if (Allocas.empty()) break;
 
     if (HasDomFrontiers)
-      PromoteMemToReg(Allocas, *DT);
+      PromoteMemToReg(Allocas, *DT, *DF);
     else {
       SSAUpdater SSA;
       for (unsigned i = 0, e = Allocas.size(); i != e; ++i) {