diff options
-rw-r--r-- | llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h | 5 | ||||
-rw-r--r-- | llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h | 2 | ||||
-rw-r--r-- | llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h b/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h index e21817852e6..981a8ddc228 100644 --- a/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h +++ b/llvm/include/llvm/Analysis/CFLAliasAnalysisUtils.h @@ -18,7 +18,8 @@ #include "llvm/IR/Function.h" #include "llvm/IR/ValueHandle.h" -using namespace llvm; +namespace llvm { +namespace cflaa { template <typename AAResult> struct FunctionHandle final : public CallbackVH { FunctionHandle(Function *Fn, AAResult *Result) @@ -41,8 +42,6 @@ private: } }; -namespace llvm { -namespace cflaa { static inline const Function *parentFunctionOfValue(const Value *Val) { if (auto *Inst = dyn_cast<Instruction>(Val)) { auto *Bb = Inst->getParent(); diff --git a/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h b/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h index 5d11a427afb..4146ad4d18a 100644 --- a/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h +++ b/llvm/include/llvm/Analysis/CFLAndersAliasAnalysis.h @@ -76,7 +76,7 @@ private: /// that simply has empty sets. DenseMap<const Function *, Optional<FunctionInfo>> Cache; - std::forward_list<FunctionHandle<CFLAndersAAResult>> Handles; + std::forward_list<cflaa::FunctionHandle<CFLAndersAAResult>> Handles; }; /// Analysis pass providing a never-invalidated alias analysis result. diff --git a/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h b/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h index 1dfdcc7c371..fd3fa5febcd 100644 --- a/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h +++ b/llvm/include/llvm/Analysis/CFLSteensAliasAnalysis.h @@ -94,7 +94,7 @@ private: /// have any kind of recursion, it is discernable from a function /// that simply has empty sets. DenseMap<Function *, Optional<FunctionInfo>> Cache; - std::forward_list<FunctionHandle<CFLSteensAAResult>> Handles; + std::forward_list<cflaa::FunctionHandle<CFLSteensAAResult>> Handles; FunctionInfo buildSetsFrom(Function *F); }; |