diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-03-19 20:34:45 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-03-19 20:34:45 +0000 |
| commit | e5cc0d5453f3a79902522c719fe4fd5765b689b3 (patch) | |
| tree | 6d0f0ff93ae13c9b645ddebb9619ad8029fc1cbc /gcc | |
| parent | 809c28c8dd3c8827ab64147994c2b57a91b09f7b (diff) | |
| download | gcc-e5cc0d5453f3a79902522c719fe4fd5765b689b3.zip gcc-e5cc0d5453f3a79902522c719fe4fd5765b689b3.tar.gz gcc-e5cc0d5453f3a79902522c719fe4fd5765b689b3.tar.bz2 | |
re PR c++/84925 (ICE with segfault in __PRETTY_FUNCTION__)
PR c++/84925
* pt.c (enclosing_instantiation_of): Check if fn is null.
* g++.dg/cpp1z/lambda-__func__.C: New test.
From-SVN: r258660
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/lambda-__func__.C | 13 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 194b468..712d4d8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-03-19 Marek Polacek <polacek@redhat.com> + + PR c++/84925 + * pt.c (enclosing_instantiation_of): Check if fn is null. + 2018-03-16 Jason Merrill <jason@redhat.com> PR c++/71834 - template-id with too few arguments. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 086cdc2..21a4de5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12917,7 +12917,7 @@ enclosing_instantiation_of (tree otctx) for (; flambda_count < lambda_count && fn && LAMBDA_FUNCTION_P (fn); fn = decl_function_context (fn)) ++flambda_count; - if (DECL_TEMPLATE_INFO (fn) + if ((fn && DECL_TEMPLATE_INFO (fn)) ? most_general_template (fn) != most_general_template (tctx) : fn != tctx) continue; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e3309b3..882dc9a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-19 Marek Polacek <polacek@redhat.com> + + PR c++/84925 + * g++.dg/cpp1z/lambda-__func__.C: New test. + 2018-03-19 Maxim Ostapenko <m.ostapenko@samsung.com> PR sanitizer/78651 diff --git a/gcc/testsuite/g++.dg/cpp1z/lambda-__func__.C b/gcc/testsuite/g++.dg/cpp1z/lambda-__func__.C new file mode 100644 index 0000000..d5d1c1c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/lambda-__func__.C @@ -0,0 +1,13 @@ +// PR c++/84925 +// { dg-options "-std=c++17" } + +template <typename> +struct A { + static const int value = 0; + static auto constexpr fn = [] { return __func__; }; +}; + +template <typename type> +int x = A<type>::value; + +auto s = x<int>; |