Skip to content

Commit 33ff3c2

Browse files
committed
Revert "Make dependency between certain analysis passes transitive"
This reverts commit 3655f07. It caused assertion failures related to setLastUser in polly builds.
1 parent 6da1c46 commit 33ff3c2

File tree

4 files changed

+15
-93
lines changed

4 files changed

+15
-93
lines changed

llvm/lib/Analysis/LazyBlockFrequencyInfo.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ void LazyBlockFrequencyInfoPass::getAnalysisUsage(AnalysisUsage &AU) const {
4545
// We require DT so it's available when LI is available. The LI updating code
4646
// asserts that DT is also present so if we don't make sure that we have DT
4747
// here, that assert will trigger.
48-
AU.addRequiredTransitive<DominatorTreeWrapperPass>();
49-
AU.addRequiredTransitive<LoopInfoWrapperPass>();
48+
AU.addRequired<DominatorTreeWrapperPass>();
49+
AU.addRequired<LoopInfoWrapperPass>();
5050
AU.setPreservesAll();
5151
}
5252

@@ -61,8 +61,8 @@ bool LazyBlockFrequencyInfoPass::runOnFunction(Function &F) {
6161

6262
void LazyBlockFrequencyInfoPass::getLazyBFIAnalysisUsage(AnalysisUsage &AU) {
6363
LazyBranchProbabilityInfoPass::getLazyBPIAnalysisUsage(AU);
64-
AU.addRequiredTransitive<LazyBlockFrequencyInfoPass>();
65-
AU.addRequiredTransitive<LoopInfoWrapperPass>();
64+
AU.addRequired<LazyBlockFrequencyInfoPass>();
65+
AU.addRequired<LoopInfoWrapperPass>();
6666
}
6767

6868
void llvm::initializeLazyBFIPassPass(PassRegistry &Registry) {

llvm/lib/Analysis/LazyBranchProbabilityInfo.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ void LazyBranchProbabilityInfoPass::getAnalysisUsage(AnalysisUsage &AU) const {
4646
// We require DT so it's available when LI is available. The LI updating code
4747
// asserts that DT is also present so if we don't make sure that we have DT
4848
// here, that assert will trigger.
49-
AU.addRequiredTransitive<DominatorTreeWrapperPass>();
50-
AU.addRequiredTransitive<LoopInfoWrapperPass>();
51-
AU.addRequiredTransitive<TargetLibraryInfoWrapperPass>();
49+
AU.addRequired<DominatorTreeWrapperPass>();
50+
AU.addRequired<LoopInfoWrapperPass>();
51+
AU.addRequired<TargetLibraryInfoWrapperPass>();
5252
AU.setPreservesAll();
5353
}
5454

@@ -63,9 +63,9 @@ bool LazyBranchProbabilityInfoPass::runOnFunction(Function &F) {
6363
}
6464

6565
void LazyBranchProbabilityInfoPass::getLazyBPIAnalysisUsage(AnalysisUsage &AU) {
66-
AU.addRequiredTransitive<LazyBranchProbabilityInfoPass>();
67-
AU.addRequiredTransitive<LoopInfoWrapperPass>();
68-
AU.addRequiredTransitive<TargetLibraryInfoWrapperPass>();
66+
AU.addRequired<LazyBranchProbabilityInfoPass>();
67+
AU.addRequired<LoopInfoWrapperPass>();
68+
AU.addRequired<TargetLibraryInfoWrapperPass>();
6969
}
7070

7171
void llvm::initializeLazyBPIPassPass(PassRegistry &Registry) {

llvm/lib/Analysis/LoopAccessAnalysis.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2281,12 +2281,12 @@ bool LoopAccessLegacyAnalysis::runOnFunction(Function &F) {
22812281
}
22822282

22832283
void LoopAccessLegacyAnalysis::getAnalysisUsage(AnalysisUsage &AU) const {
2284-
AU.addRequiredTransitive<ScalarEvolutionWrapperPass>();
2285-
AU.addRequiredTransitive<AAResultsWrapperPass>();
2286-
AU.addRequiredTransitive<DominatorTreeWrapperPass>();
2287-
AU.addRequiredTransitive<LoopInfoWrapperPass>();
2284+
AU.addRequired<ScalarEvolutionWrapperPass>();
2285+
AU.addRequired<AAResultsWrapperPass>();
2286+
AU.addRequired<DominatorTreeWrapperPass>();
2287+
AU.addRequired<LoopInfoWrapperPass>();
22882288

2289-
AU.setPreservesAll();
2289+
AU.setPreservesAll();
22902290
}
22912291

22922292
char LoopAccessLegacyAnalysis::ID = 0;

llvm/test/Other/pr49950.ll

-78
This file was deleted.

0 commit comments

Comments
 (0)