diff options
Diffstat (limited to 'llvm/lib/Analysis')
| -rw-r--r-- | llvm/lib/Analysis/EHPersonalities.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Analysis/ScalarEvolutionExpander.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Analysis/ValueTracking.cpp | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/Analysis/EHPersonalities.cpp b/llvm/lib/Analysis/EHPersonalities.cpp index 3704d49c91d..01be8b38fad 100644 --- a/llvm/lib/Analysis/EHPersonalities.cpp +++ b/llvm/lib/Analysis/EHPersonalities.cpp @@ -57,9 +57,8 @@ DenseMap<BasicBlock *, ColorVector> llvm::colorEHFunclets(Function &F) { // contain" is used to distinguish from being "transitively contained" in // a nested funclet). // - // Note: Despite not being funclets in the truest sense, terminatepad and - // catchswitch are considered to belong to their own funclet for the purposes - // of coloring. + // Note: Despite not being a funclet in the truest sense, a catchswitch is + // considered to belong to its own funclet for the purposes of coloring. DEBUG_WITH_TYPE("winehprepare-coloring", dbgs() << "\nColoring funclets for " << F.getName() << "\n"); diff --git a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp index bcbf35b046b..2a374587a7a 100644 --- a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp +++ b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp @@ -98,8 +98,6 @@ static BasicBlock::iterator findInsertPointAfter(Instruction *I, while (IP->isEHPad()) { if (isa<FuncletPadInst>(IP) || isa<LandingPadInst>(IP)) { ++IP; - } else if (auto *TPI = dyn_cast<TerminatePadInst>(IP)) { - IP = TPI->getUnwindDest()->getFirstNonPHI()->getIterator(); } else if (isa<CatchSwitchInst>(IP)) { IP = MustDominate->getFirstInsertionPt(); } else { diff --git a/llvm/lib/Analysis/ValueTracking.cpp b/llvm/lib/Analysis/ValueTracking.cpp index 4a228c30a93..358aa8ed895 100644 --- a/llvm/lib/Analysis/ValueTracking.cpp +++ b/llvm/lib/Analysis/ValueTracking.cpp @@ -3436,7 +3436,6 @@ bool llvm::isSafeToSpeculativelyExecute(const Value *V, case Instruction::CatchRet: case Instruction::CleanupPad: case Instruction::CleanupRet: - case Instruction::TerminatePad: return false; // Misc instructions which have effects } } |
