diff options
| -rw-r--r-- | llvm/include/llvm/Transforms/Utils/CodeExtractor.h | 11 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/LoopExtractor.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Utils/CodeExtractor.cpp | 12 |
3 files changed, 1 insertions, 24 deletions
diff --git a/llvm/include/llvm/Transforms/Utils/CodeExtractor.h b/llvm/include/llvm/Transforms/Utils/CodeExtractor.h index 333ed67..68eb00a 100644 --- a/llvm/include/llvm/Transforms/Utils/CodeExtractor.h +++ b/llvm/include/llvm/Transforms/Utils/CodeExtractor.h @@ -32,7 +32,6 @@ class CallInst; class DominatorTree; class Function; class Instruction; -class Loop; class Module; class Type; class Value; @@ -143,16 +142,6 @@ public: BasicBlock *AllocationBlock = nullptr, std::string Suffix = "", bool ArgsInZeroAddressSpace = false); - /// Create a code extractor for a loop body. - /// - /// Behaves just like the generic code sequence constructor, but uses the - /// block sequence of the loop. - CodeExtractor(DominatorTree &DT, Loop &L, bool AggregateArgs = false, - BlockFrequencyInfo *BFI = nullptr, - BranchProbabilityInfo *BPI = nullptr, - AssumptionCache *AC = nullptr, - std::string Suffix = ""); - /// Perform the extraction, returning the new function. /// /// Returns zero when called on a CodeExtractor instance where isEligible diff --git a/llvm/lib/Transforms/IPO/LoopExtractor.cpp b/llvm/lib/Transforms/IPO/LoopExtractor.cpp index 9a5876f..24b3c42 100644 --- a/llvm/lib/Transforms/IPO/LoopExtractor.cpp +++ b/llvm/lib/Transforms/IPO/LoopExtractor.cpp @@ -241,7 +241,7 @@ bool LoopExtractor::extractLoop(Loop *L, LoopInfo &LI, DominatorTree &DT) { Function &Func = *L->getHeader()->getParent(); AssumptionCache *AC = LookupAssumptionCache(Func); CodeExtractorAnalysisCache CEAC(Func); - CodeExtractor Extractor(DT, *L, false, nullptr, nullptr, AC); + CodeExtractor Extractor(L->getBlocks(), &DT, false, nullptr, nullptr, AC); if (Extractor.extractCodeRegion(CEAC)) { LI.erase(L); --NumLoops; diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp index 94c7f16..81d3243 100644 --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -23,7 +23,6 @@ #include "llvm/Analysis/BlockFrequencyInfo.h" #include "llvm/Analysis/BlockFrequencyInfoImpl.h" #include "llvm/Analysis/BranchProbabilityInfo.h" -#include "llvm/Analysis/LoopInfo.h" #include "llvm/IR/Argument.h" #include "llvm/IR/Attributes.h" #include "llvm/IR/BasicBlock.h" @@ -253,17 +252,6 @@ CodeExtractor::CodeExtractor(ArrayRef<BasicBlock *> BBs, DominatorTree *DT, Blocks(buildExtractionBlockSet(BBs, DT, AllowVarArgs, AllowAlloca)), Suffix(Suffix), ArgsInZeroAddressSpace(ArgsInZeroAddressSpace) {} -CodeExtractor::CodeExtractor(DominatorTree &DT, Loop &L, bool AggregateArgs, - BlockFrequencyInfo *BFI, - BranchProbabilityInfo *BPI, AssumptionCache *AC, - std::string Suffix) - : DT(&DT), AggregateArgs(AggregateArgs || AggregateArgsOpt), BFI(BFI), - BPI(BPI), AC(AC), AllocationBlock(nullptr), AllowVarArgs(false), - Blocks(buildExtractionBlockSet(L.getBlocks(), &DT, - /* AllowVarArgs */ false, - /* AllowAlloca */ false)), - Suffix(Suffix) {} - /// definedInRegion - Return true if the specified value is defined in the /// extracted region. static bool definedInRegion(const SetVector<BasicBlock *> &Blocks, Value *V) { |