diff options
| -rw-r--r-- | clang/lib/StaticAnalyzer/Core/BasicStore.cpp | 15 | ||||
| -rw-r--r-- | clang/test/Analysis/cxx-crashes.cpp | 11 |
2 files changed, 20 insertions, 6 deletions
diff --git a/clang/lib/StaticAnalyzer/Core/BasicStore.cpp b/clang/lib/StaticAnalyzer/Core/BasicStore.cpp index 98365e7f4e6..4faa84ca266 100644 --- a/clang/lib/StaticAnalyzer/Core/BasicStore.cpp +++ b/clang/lib/StaticAnalyzer/Core/BasicStore.cpp @@ -429,12 +429,15 @@ StoreRef BasicStoreManager::getInitialStore(const LocationContext *InitLoc) { } if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(InitLoc->getDecl())) { - // For C++ methods add symbolic region for 'this' in initial stack frame. - QualType ThisT = MD->getThisType(StateMgr.getContext()); - MemRegionManager &RegMgr = svalBuilder.getRegionManager(); - const CXXThisRegion *ThisR = RegMgr.getCXXThisRegion(ThisT, InitLoc); - SVal ThisV = svalBuilder.getRegionValueSymbolVal(ThisR); - St = Bind(St.getStore(), svalBuilder.makeLoc(ThisR), ThisV); + // For C++ non-static member variables, add a symbolic region for 'this' in + // the initial stack frame. + if (MD->isInstance()) { + QualType ThisT = MD->getThisType(StateMgr.getContext()); + MemRegionManager &RegMgr = svalBuilder.getRegionManager(); + const CXXThisRegion *ThisR = RegMgr.getCXXThisRegion(ThisT, InitLoc); + SVal ThisV = svalBuilder.getRegionValueSymbolVal(ThisR); + St = Bind(St.getStore(), svalBuilder.makeLoc(ThisR), ThisV); + } } return St; diff --git a/clang/test/Analysis/cxx-crashes.cpp b/clang/test/Analysis/cxx-crashes.cpp index 17e7c6dc0c8..17fc74d06f4 100644 --- a/clang/test/Analysis/cxx-crashes.cpp +++ b/clang/test/Analysis/cxx-crashes.cpp @@ -43,3 +43,14 @@ void *f(S* w) { } } + +namespace { + +struct C { + void *p; + static void f(); +}; + +void C::f() { } + +} |
