[PATCH] D49484: [CodeComplete] Allow getDeclaration on RK_Pattern result.
This revision was automatically updated to reflect the committed changes. Closed by commit rL337394: [CodeComplete] Allow getDeclaration on RK_Pattern result. (authored by ioeric, committed by ). Herald added a subscriber: llvm-commits. Repository: rL LLVM https://reviews.llvm.org/D49484 Files: cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h Index: cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h === --- cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h +++ cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h @@ -895,9 +895,11 @@ computeCursorKindAndAvailability(); } - /// Retrieve the declaration stored in this result. + /// Retrieve the declaration stored in this result. This might be nullptr if + /// Kind is RK_Pattern. const NamedDecl *getDeclaration() const { -assert(Kind == RK_Declaration && "Not a declaration result"); +assert(((Kind == RK_Declaration) || (Kind == RK_Pattern)) && + "Not a declaration or pattern result"); return Declaration; } Index: cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h === --- cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h +++ cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h @@ -895,9 +895,11 @@ computeCursorKindAndAvailability(); } - /// Retrieve the declaration stored in this result. + /// Retrieve the declaration stored in this result. This might be nullptr if + /// Kind is RK_Pattern. const NamedDecl *getDeclaration() const { -assert(Kind == RK_Declaration && "Not a declaration result"); +assert(((Kind == RK_Declaration) || (Kind == RK_Pattern)) && + "Not a declaration or pattern result"); return Declaration; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D49484: [CodeComplete] Allow getDeclaration on RK_Pattern result.
bkramer accepted this revision. bkramer added a comment. This revision is now accepted and ready to land. lg Repository: rC Clang https://reviews.llvm.org/D49484 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D49484: [CodeComplete] Allow getDeclaration on RK_Pattern result.
ioeric created this revision. ioeric added a reviewer: bkramer. Herald added a subscriber: cfe-commits. RK_Pattern results can also have associated declarations e.g. field decls in constructor initializers. Repository: rC Clang https://reviews.llvm.org/D49484 Files: include/clang/Sema/CodeCompleteConsumer.h Index: include/clang/Sema/CodeCompleteConsumer.h === --- include/clang/Sema/CodeCompleteConsumer.h +++ include/clang/Sema/CodeCompleteConsumer.h @@ -895,9 +895,11 @@ computeCursorKindAndAvailability(); } - /// Retrieve the declaration stored in this result. + /// Retrieve the declaration stored in this result. This might be nullptr if + /// Kind is RK_Pattern. const NamedDecl *getDeclaration() const { -assert(Kind == RK_Declaration && "Not a declaration result"); +assert(((Kind == RK_Declaration) || (Kind == RK_Pattern)) && + "Not a declaration or pattern result"); return Declaration; } Index: include/clang/Sema/CodeCompleteConsumer.h === --- include/clang/Sema/CodeCompleteConsumer.h +++ include/clang/Sema/CodeCompleteConsumer.h @@ -895,9 +895,11 @@ computeCursorKindAndAvailability(); } - /// Retrieve the declaration stored in this result. + /// Retrieve the declaration stored in this result. This might be nullptr if + /// Kind is RK_Pattern. const NamedDecl *getDeclaration() const { -assert(Kind == RK_Declaration && "Not a declaration result"); +assert(((Kind == RK_Declaration) || (Kind == RK_Pattern)) && + "Not a declaration or pattern result"); return Declaration; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits