diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-02-20 22:23:23 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-02-20 22:23:23 +0000 |
| commit | dc84cd5efdd3430efb22546b4ac656aa0540b210 (patch) | |
| tree | 665bcfc03575e55f8d053acf20ff6d8979b3bd14 /lib/StaticAnalyzer/Core/CallEvent.cpp | |
| parent | 9e85b29dd17fd3878134216f9abaf5ec4774b2a5 (diff) | |
Include llvm::Optional in clang/Basic/LLVM.h
Post-commit CR feedback from Jordan Rose regarding r175594.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175679 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/StaticAnalyzer/Core/CallEvent.cpp')
| -rw-r--r-- | lib/StaticAnalyzer/Core/CallEvent.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/StaticAnalyzer/Core/CallEvent.cpp b/lib/StaticAnalyzer/Core/CallEvent.cpp index a09d483150..c5e3c051da 100644 --- a/lib/StaticAnalyzer/Core/CallEvent.cpp +++ b/lib/StaticAnalyzer/Core/CallEvent.cpp @@ -156,7 +156,7 @@ ProgramStateRef CallEvent::invalidateRegions(unsigned BlockCount, // If we are passing a location wrapped as an integer, unwrap it and // invalidate the values referred by the location. - if (llvm::Optional<nonloc::LocAsInteger> Wrapped = + if (Optional<nonloc::LocAsInteger> Wrapped = V.getAs<nonloc::LocAsInteger>()) V = Wrapped->getLoc(); else if (!V.getAs<Loc>()) @@ -854,12 +854,11 @@ RuntimeDefinition ObjCMethodCall::getRuntimeDefinition() const { typedef std::pair<const ObjCInterfaceDecl*, Selector> PrivateMethodKey; typedef llvm::DenseMap<PrivateMethodKey, - llvm::Optional<const ObjCMethodDecl *> > + Optional<const ObjCMethodDecl *> > PrivateMethodCache; static PrivateMethodCache PMC; - llvm::Optional<const ObjCMethodDecl *> &Val = - PMC[std::make_pair(IDecl, Sel)]; + Optional<const ObjCMethodDecl *> &Val = PMC[std::make_pair(IDecl, Sel)]; // Query lookupPrivateMethod() if the cache does not hit. if (!Val.hasValue()) |