diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-12-04 19:00:28 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-12-04 19:00:28 +0100 |
| commit | 565839ae124b82b6eba1d0f8053271df0f7c4c2a (patch) | |
| tree | e826707699f6cbc54adc85d95f6eb30223363229 /gcc | |
| parent | 3bd7b086fdd32ce44e735929351bfbc832e5bfaa (diff) | |
| download | gcc-565839ae124b82b6eba1d0f8053271df0f7c4c2a.zip gcc-565839ae124b82b6eba1d0f8053271df0f7c4c2a.tar.gz gcc-565839ae124b82b6eba1d0f8053271df0f7c4c2a.tar.bz2 | |
re PR c++/59268 ([c++11] ICE with constexpr in a virtual function)
PR c++/59268
* pt.c (tsubst_copy_and_build): Handle POINTER_PLUS_EXPR.
* g++.dg/cpp0x/constexpr-template6.C: New test.
From-SVN: r205674
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C | 20 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e2fc2a2..119f309 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-04 Jakub Jelinek <jakub@redhat.com> + + PR c++/59268 + * pt.c (tsubst_copy_and_build): Handle POINTER_PLUS_EXPR. + 2013-11-29 Marek Polacek <polacek@redhat.com> PR sanitizer/59331 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b58c755..25d940c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14159,6 +14159,10 @@ tsubst_copy_and_build (tree t, RETURN (r); } + case POINTER_PLUS_EXPR: + return fold_build_pointer_plus (RECUR (TREE_OPERAND (t, 0)), + RECUR (TREE_OPERAND (t, 1))); + case SCOPE_REF: RETURN (tsubst_qualified_id (t, args, complain, in_decl, /*done=*/true, /*address_p=*/false)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3fe3212..b233156 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-12-04 Jakub Jelinek <jakub@redhat.com> + + PR c++/59268 + * g++.dg/cpp0x/constexpr-template6.C: New test. + 2013-12-04 Eric Botcazou <ebotcazou@adacore.com> * gnat.dg/pack19.adb: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C new file mode 100644 index 0000000..eac6004 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C @@ -0,0 +1,20 @@ +// PR c++/59268 +// { dg-do compile } +// { dg-options "-std=c++11" } + +template <typename> +struct A +{ + constexpr A (int) {} + virtual void foo () + { + constexpr A<void> a (0); + } +}; + +void +bar () +{ + A<int> a (3); + a.foo (); +} |