diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-03-08 02:08:05 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-03-08 02:08:05 +0000 |
| commit | 3f28ec28d5ac6f7f5dcebf30dc2c438817fdf733 (patch) | |
| tree | 15e8f14d9b2927e9e0d739aac05460aa65397d5e /clang/lib/AST/Decl.cpp | |
| parent | dd1637c39351c52f0adf306acc882010d4b2c2b7 (diff) | |
| download | bcm5719-llvm-3f28ec28d5ac6f7f5dcebf30dc2c438817fdf733.tar.gz bcm5719-llvm-3f28ec28d5ac6f7f5dcebf30dc2c438817fdf733.zip | |
Loosen the precondition of isCXXInstanceMember() to simply return
"false" for declarations that aren't members of classes. Fixes PR12106.
llvm-svn: 152284
Diffstat (limited to 'clang/lib/AST/Decl.cpp')
| -rw-r--r-- | clang/lib/AST/Decl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp index d5e048a7c4a..63f1f16ea65 100644 --- a/clang/lib/AST/Decl.cpp +++ b/clang/lib/AST/Decl.cpp @@ -997,9 +997,9 @@ NamedDecl *NamedDecl::getUnderlyingDecl() { } bool NamedDecl::isCXXInstanceMember() const { - assert(isCXXClassMember() && - "checking whether non-member is instance member"); - + if (!isCXXClassMember()) + return false; + const NamedDecl *D = this; if (isa<UsingShadowDecl>(D)) D = cast<UsingShadowDecl>(D)->getTargetDecl(); |
