diff options
| author | Alina Sbirlea <asbirlea@google.com> | 2017-12-07 00:43:19 +0000 |
|---|---|---|
| committer | Alina Sbirlea <asbirlea@google.com> | 2017-12-07 00:43:19 +0000 |
| commit | d6037ebeeb3f6d4fddf7563682eb8d44969cc760 (patch) | |
| tree | 3d7c240ff6c08d7007f36c086b2f96274f6b77cf /llvm/lib | |
| parent | bd72cd957767e3e875d6070b1ff7bbd5289467ad (diff) | |
| download | bcm5719-llvm-d6037ebeeb3f6d4fddf7563682eb8d44969cc760.tar.gz bcm5719-llvm-d6037ebeeb3f6d4fddf7563682eb8d44969cc760.zip | |
[ModRefInfo] Replace remaining bit-wise operations with wrappers.
llvm-svn: 319993
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Analysis/BasicAliasAnalysis.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Analysis/GlobalsModRef.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Analysis/MemoryDependenceAnalysis.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Analysis/BasicAliasAnalysis.cpp b/llvm/lib/Analysis/BasicAliasAnalysis.cpp index b40f24a6fb0..5522803b174 100644 --- a/llvm/lib/Analysis/BasicAliasAnalysis.cpp +++ b/llvm/lib/Analysis/BasicAliasAnalysis.cpp @@ -823,7 +823,7 @@ ModRefInfo BasicAAResult::getModRefInfo(ImmutableCallSite CS, } // Early return if we improved mod ref information - if (Result != MRI_ModRef) + if (!isModAndRefSet(Result)) return Result; } diff --git a/llvm/lib/Analysis/GlobalsModRef.cpp b/llvm/lib/Analysis/GlobalsModRef.cpp index 732be0da259..6dc8b24508d 100644 --- a/llvm/lib/Analysis/GlobalsModRef.cpp +++ b/llvm/lib/Analysis/GlobalsModRef.cpp @@ -149,7 +149,7 @@ public: if (AlignedMap *P = Info.getPointer()) { auto I = P->Map.find(&GV); if (I != P->Map.end()) - GlobalMRI = ModRefInfo(GlobalMRI | I->second); + GlobalMRI = unionModRef(GlobalMRI, I->second); } return GlobalMRI; } @@ -174,7 +174,7 @@ public: Info.setPointer(P); } auto &GlobalMRI = P->Map[&GV]; - GlobalMRI = ModRefInfo(GlobalMRI | NewMRI); + GlobalMRI = unionModRef(GlobalMRI, NewMRI); } /// Clear a global's ModRef info. Should be used when a global is being @@ -570,7 +570,7 @@ void GlobalsAAResult::AnalyzeCallGraph(CallGraph &CG, Module &M) { if (Callee->isIntrinsic()) { FunctionModRefBehavior Behaviour = AAResultBase::getModRefBehavior(Callee); - FI.addModRefInfo(ModRefInfo(Behaviour & MRI_ModRef)); + FI.addModRefInfo(createModRefInfo(Behaviour)); } } continue; diff --git a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp index 57d04af0470..eafc7061f88 100644 --- a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -747,7 +747,7 @@ MemDepResult MemoryDependenceResults::getDependency(Instruction *QueryInst) { ModRefInfo MR = GetLocation(QueryInst, MemLoc, TLI); if (MemLoc.Ptr) { // If we can do a pointer scan, make it happen. - bool isLoad = !(MR & MRI_Mod); + bool isLoad = !isModSet(MR); if (auto *II = dyn_cast<IntrinsicInst>(QueryInst)) isLoad |= II->getIntrinsicID() == Intrinsic::lifetime_start; |
