OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[Scalar] Use std::optional in LoopSimplifyCFG.cpp (NFC) 

This is part of an effort to migrate from llvm::Optional to
std::optional:

https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
This commit is contained in:
Kazu Hirata 2022-11-26 17:24:20 -08:00
parent 27ae2354a0
commit 42c40f7e35
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp
View File

@ -32,6 +32,7 @@
#include "llvm/Transforms/Scalar/LoopPassManager.h" #include "llvm/Transforms/Scalar/LoopPassManager.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/LoopUtils.h" #include "llvm/Transforms/Utils/LoopUtils.h"
#include <optional>
using namespace llvm; using namespace llvm;
#define DEBUG_TYPE "loop-simplifycfg" #define DEBUG_TYPE "loop-simplifycfg"
@ -717,7 +718,7 @@ static bool simplifyLoopCFG(Loop &L, DominatorTree &DT, LoopInfo &LI,
PreservedAnalyses LoopSimplifyCFGPass::run(Loop &L, LoopAnalysisManager &AM, PreservedAnalyses LoopSimplifyCFGPass::run(Loop &L, LoopAnalysisManager &AM,
LoopStandardAnalysisResults &AR, LoopStandardAnalysisResults &AR,
LPMUpdater &LPMU) { LPMUpdater &LPMU) {
Optional<MemorySSAUpdater> MSSAU; std::optional<MemorySSAUpdater> MSSAU;
if (AR.MSSA) if (AR.MSSA)
MSSAU = MemorySSAUpdater(AR.MSSA); MSSAU = MemorySSAUpdater(AR.MSSA);
bool DeleteCurrentLoop = false; bool DeleteCurrentLoop = false;
@ -750,7 +751,7 @@ public:
LoopInfo &LI = getAnalysis<LoopInfoWrapperPass>().getLoopInfo(); LoopInfo &LI = getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
ScalarEvolution &SE = getAnalysis<ScalarEvolutionWrapperPass>().getSE(); ScalarEvolution &SE = getAnalysis<ScalarEvolutionWrapperPass>().getSE();
auto *MSSAA = getAnalysisIfAvailable<MemorySSAWrapperPass>(); auto *MSSAA = getAnalysisIfAvailable<MemorySSAWrapperPass>();
Optional<MemorySSAUpdater> MSSAU; std::optional<MemorySSAUpdater> MSSAU;
if (MSSAA) if (MSSAA)
MSSAU = MemorySSAUpdater(&MSSAA->getMSSA()); MSSAU = MemorySSAUpdater(&MSSAA->getMSSA());
if (MSSAA && VerifyMemorySSA) if (MSSAA && VerifyMemorySSA)