diff options
| author | Jason Merrill <jason@redhat.com> | 2017-02-20 01:06:20 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-02-20 01:06:20 -0500 |
| commit | bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4 (patch) | |
| tree | 6cc39a69826ad9678cd2bf4c5403bc8a292e9879 /gcc | |
| parent | 736a933c00ff57c2631bae3d1eeeacd73faf003c (diff) | |
| download | gcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.zip gcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.tar.gz gcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.tar.bz2 | |
PR c++/79606 - ICE with this->base_member in NSDMI
* class.c (build_base_path): Check processing_template_decl.
From-SVN: r245593
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/class.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-template16.C | 14 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3ae8893..7258348 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2017-02-19 Jason Merrill <jason@redhat.com> + PR c++/79606 - ICE with this->base_member in NSDMI + * class.c (build_base_path): Check processing_template_decl. + PR c++/79607 - ICE with T{} initializer * decl.c (type_dependent_init_p): Check the type of a CONSTRUCTOR. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1442b55..9e4b4c4 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -375,6 +375,7 @@ build_base_path (enum tree_code code, set up properly yet, and the value doesn't matter there either; we're just interested in the result of overload resolution. */ if (cp_unevaluated_operand != 0 + || processing_template_decl || in_template_function ()) { expr = build_nop (ptr_target_type, expr); diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template16.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template16.C new file mode 100644 index 0000000..58dec7b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template16.C @@ -0,0 +1,14 @@ +// PR c++/79606 +// { dg-do compile { target c++11 } } + +struct A +{ + int i = 0; +}; + +template<int> struct B : A +{ + int j = this->i; +}; + +B<0> b; |