diff options
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/pr25181-crash-on-invalid.cpp | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 89ef35c88bb..07e32b7e42c 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -52,7 +52,8 @@ NamedDecl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, } } - HandleMemberFunctionDeclDelays(D, FnD); + if (FnD) + HandleMemberFunctionDeclDelays(D, FnD); D.complete(FnD); diff --git a/clang/test/SemaCXX/pr25181-crash-on-invalid.cpp b/clang/test/SemaCXX/pr25181-crash-on-invalid.cpp new file mode 100644 index 00000000000..41178c95e8a --- /dev/null +++ b/clang/test/SemaCXX/pr25181-crash-on-invalid.cpp @@ -0,0 +1,7 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s +// Don't crash (PR25181). + +template <typename T> class Foo { // expected-note {{template parameter is declared here}} + template <typename T> // expected-error {{declaration of 'T' shadows template parameter}} + void Foo<T>::method(T *) const throw() {} // expected-error {{nested name specifier 'Foo<T>::' for declaration does not refer into a class, class template or class template partial specialization}} +}; |
