diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-06-27 17:44:39 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-06-27 17:44:39 +0000 |
| commit | a245edc82ff2f3ae9cd28a77502aa293f1c65ebf (patch) | |
| tree | 20fa08cd44407d1801da9e996cd289319336ad7f /clang/lib | |
| parent | b94a8f0c393f176f58f4beb030f2f683c73270f7 (diff) | |
| download | bcm5719-llvm-a245edc82ff2f3ae9cd28a77502aa293f1c65ebf.tar.gz bcm5719-llvm-a245edc82ff2f3ae9cd28a77502aa293f1c65ebf.zip | |
Fix a crash I introduced in r159212.
llvm-svn: 159279
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/DeclCXX.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index a8aabb68d75..4de157e9f5a 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -1290,7 +1290,7 @@ CXXMethodDecl::getCorrespondingMethodInClass(const CXXRecordDecl *RD) { // Lookup doesn't work for destructors, so handle them separately. if (isa<CXXDestructorDecl>(this)) { CXXMethodDecl *MD = RD->getDestructor(); - if (recursivelyOverrides(MD, this)) + if (MD && recursivelyOverrides(MD, this)) return MD; return NULL; } diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 4dd6f0b5524..bc77e6fae7e 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -10859,6 +10859,8 @@ static void MarkExprReferenced(Sema &SemaRef, SourceLocation Loc, if (!MostDerivedClassDecl) return; CXXMethodDecl *DM = MD->getCorrespondingMethodInClass(MostDerivedClassDecl); + if (!DM) + return; SemaRef.MarkAnyDeclReferenced(Loc, DM); } |
